summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2011-11-06 19:06:21 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-12 11:35:17 -0800
commit5ccce01507d92e98ca263b35aa263f43e24b272f (patch)
tree8d076f45d1c7dc7f3049194a25c64fe226e968cc
parenta2cb6c3022494f6e43d284ed9159e15dd71f5937 (diff)
downloadlinux-stable-5ccce01507d92e98ca263b35aa263f43e24b272f.tar.gz
linux-stable-5ccce01507d92e98ca263b35aa263f43e24b272f.tar.bz2
linux-stable-5ccce01507d92e98ca263b35aa263f43e24b272f.zip
USB: omninet: fix write_room
commit 694c6301e515bad574af74b6552134c4d9dcb334 upstream. 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> 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 60f38d5e64fc..0a8c1e64b247 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -315,7 +315,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);