---

yaml --- r: 265137 b: refs/heads/master c: da7fbb6 h: refs/heads/master i: 265135: 618f26e v: v3
git-mirror · Oct 18, 2011 · 8e6446a · 8e6446a
1 parent 6067034
commit 8e6446a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -1918,13 +1918,15 @@ 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;
 		}
 		spin_unlock_irqrestore(&port->lock, flags);
 	} else {
 		count = kfifo_out_locked(&port->write_fifo, dest, size,
 								&port->lock);
+		priv->icount.tx += count;
 	}
 
 	return count;