USB: ftdi_sio: fix legacy SIO-device header
authorJohan Hovold <jhovold@gmail.com>
Tue, 18 May 2010 22:01:41 +0000 (00:01 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 20 May 2010 20:21:50 +0000 (13:21 -0700)
Length field of header was incorrectly set to available payload space
rather than the actual payload size.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/serial/ftdi_sio.c

index 97f2d9c1edd6da102e18260da335977ff90c63b4..050211afc07ede3ded137a28b46aba79dcb01ebe 100644 (file)
@@ -1752,10 +1752,10 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port,
                spin_lock_irqsave(&port->lock, flags);
                for (i = 0; i < size - 1; i += priv->max_packet_size) {
                        len = min_t(int, size - i, priv->max_packet_size) - 1;
-                       buffer[i] = (len << 2) + 1;
                        c = kfifo_out(&port->write_fifo, &buffer[i + 1], len);
                        if (!c)
                                break;
+                       buffer[i] = (c << 2) + 1;
                        count += c + 1;
                }
                spin_unlock_irqrestore(&port->lock, flags);