summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2011-11-06 19:06:21 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-15 19:33:10 +0100
commit694c6301e515bad574af74b6552134c4d9dcb334 (patch)
tree42553bd4038b49080e218da07786997209886bc6
parentUSB: serial: remove changelogs and old todo entries (diff)
downloadlinux-694c6301e515bad574af74b6552134c4d9dcb334.tar.xz
linux-694c6301e515bad574af74b6552134c4d9dcb334.zip
USB: omninet: fix write_room
Fix regression introduced by commit 507ca9bc047666 ([PATCH] USB: add ability for usb-serial drivers to determine if their write urb is currently being used.) which inverted the logic in write_room so that it returns zero when the write urb is actually free. Signed-off-by: Johan Hovold <jhovold@gmail.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/omninet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 6d7c56d0cb61..6e976649fcae 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -290,7 +290,7 @@ static int omninet_write_room(struct tty_struct *tty)
int room = 0; /* Default: no room */
/* FIXME: no consistent locking for write_urb_busy */
- if (wport->write_urb_busy)
+ if (!wport->write_urb_busy)
room = wport->bulk_out_size - OMNINET_HEADERLEN;
dbg("%s - returns %d", __func__, room);