From 4a0b05ecf6e49244832115ba01ac75cd2fc954cd Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Mon, 29 Oct 2012 10:56:27 +0100
Subject: [PATCH] --- yaml --- r: 338556 b: refs/heads/master c:
 8da636d9b5f3af354458f5b7eadaf51f23017fdc h: refs/heads/master 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 33a1e8342c53..e719a1c9c7f8 100644
--- 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
index 9fe3a2e965ad..b8bc9d0cb127 100644
--- 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) {