summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandall Nortman <linuxkernellist@wonderclown.com>2005-10-15 02:21:50 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-15 03:13:31 +0200
commit7a3ca7d2b5ec31b2cfa594b961d77e68075e33c7 (patch)
tree29ba927b48b3c69517954dcbf45098455d4ea6e4
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadlinux-7a3ca7d2b5ec31b2cfa594b961d77e68075e33c7.tar.xz
linux-7a3ca7d2b5ec31b2cfa594b961d77e68075e33c7.zip
[PATCH] usbserial: Regression in USB generic serial driver
Kernel version 2.6.13 introduced a regression in the generic USB serial converter driver (usbserial.o, drivers/usb/serial/generic.c). The bug manifests, as far as I can tell, whenever you attempt to write to the device -- the write will never complete (write() returns 0, or blocks). Signed-off-by: Randall Nortman <oss@wonderclown.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/usb/serial/generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index ddde5fb13f6b..5f7d3193d355 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -223,7 +223,7 @@ int usb_serial_generic_write_room (struct usb_serial_port *port)
dbg("%s - port %d", __FUNCTION__, port->number);
if (serial->num_bulk_out) {
- if (port->write_urb_busy)
+ if (!(port->write_urb_busy))
room = port->bulk_out_size;
}