---

yaml --- r: 338556 b: refs/heads/master c: 8da636d h: refs/heads/master v: v3
git-mirror · Oct 30, 2012 · 4a0b05e · 4a0b05e
1 parent 8c68c79
commit 4a0b05e
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: 755b6040fa62eab9d9105359cd5884910eef2df4
+refs/heads/master: 8da636d9b5f3af354458f5b7eadaf51f23017fdc
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -2098,6 +2098,8 @@ static int ftdi_chars_in_buffer(struct tty_struct *tty)
 	int ret;
 
 	chars = usb_serial_generic_chars_in_buffer(tty);
+	if (chars)
+		return chars;
 
 	/* Check hardware buffer */
 	switch (priv->chip_type) {