aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorUwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>2011-10-10 11:24:27 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-18 16:46:30 -0400
commitda7fbb6dd061fc4e2945d63cf04f843063dd51e5 (patch)
tree0c0d7b92b1b14cf44a44263fdaf828ed44379c62 /drivers/usb/serial
parentc9222ec92e6ac60a4624234b61cf848c237e8e0e (diff)
USB: ftdi_sio.c:Fill TX field of the ftdi async_icount structure
Signed-off-by: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index cb0ecd5b2e4b..a865df81a551 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1918,6 +1918,7 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port,
1918 c = kfifo_out(&port->write_fifo, &buffer[i + 1], len); 1918 c = kfifo_out(&port->write_fifo, &buffer[i + 1], len);
1919 if (!c) 1919 if (!c)
1920 break; 1920 break;
1921 priv->icount.tx += c;
1921 buffer[i] = (c << 2) + 1; 1922 buffer[i] = (c << 2) + 1;
1922 count += c + 1; 1923 count += c + 1;
1923 } 1924 }
@@ -1925,6 +1926,7 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port,
1925 } else { 1926 } else {
1926 count = kfifo_out_locked(&port->write_fifo, dest, size, 1927 count = kfifo_out_locked(&port->write_fifo, dest, size,
1927 &port->lock); 1928 &port->lock);
1929 priv->icount.tx += count;
1928 } 1930 }
1929 1931
1930 return count; 1932 return count;