From 8e6446a5644dc241e0faaa03c3299acb93cc06e3 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Mon, 10 Oct 2011 17:24:27 +0200 Subject: [PATCH] --- yaml --- r: 265137 b: refs/heads/master c: da7fbb6dd061fc4e2945d63cf04f843063dd51e5 h: refs/heads/master i: 265135: 618f26e3421e4d33816d97b775fc19d702b4b06f v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6e93793c6dcc..785b347a9166 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9222ec92e6ac60a4624234b61cf848c237e8e0e +refs/heads/master: da7fbb6dd061fc4e2945d63cf04f843063dd51e5 diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index cb0ecd5b2e4b..a865df81a551 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/drivers/usb/serial/ftdi_sio.c @@ -1918,6 +1918,7 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port, c = kfifo_out(&port->write_fifo, &buffer[i + 1], len); if (!c) break; + priv->icount.tx += c; buffer[i] = (c << 2) + 1; count += c + 1; } @@ -1925,6 +1926,7 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port, } else { count = kfifo_out_locked(&port->write_fifo, dest, size, &port->lock); + priv->icount.tx += count; } return count;