---

yaml --- r: 125064 b: refs/heads/master c: eff6937 h: refs/heads/master v: v3
git-mirror · Jan 2, 2009 · 37468c6 · 37468c6
1 parent e0238c0
commit 37468c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39aced68d664291db3324d0fcf0985ab5626aac2
+refs/heads/master: eff6937a46e096eb35c16a391617b7a5e098a30c
diff --git a/trunk/drivers/usb/serial/usb-serial.c b/trunk/drivers/usb/serial/usb-serial.c
@@ -339,6 +339,10 @@ static int serial_chars_in_buffer(struct tty_struct *tty)
 	dbg("%s = port %d", __func__, port->number);
 
 	WARN_ON(!port->port.count);
+	/* if the device was unplugged then any remaining characters
+	   fell out of the connector ;) */
+	if (port->serial->disconnected)
+		return 0;
 	/* pass on to the driver specific version of this function */
 	return port->serial->type->chars_in_buffer(tty);
 }