aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/serial/omninet.c
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2012-01-15 08:35:28 +0100
committerBjørn Mork <bjorn@mork.no>2012-01-15 08:35:28 +0100
commit6528209ba2c94f3a0ef946b7d808d9a15b30ec50 (patch)
treec3c1b8bcf8ae19f411c53c2f199f923742bcc256 /drivers/usb/serial/omninet.c
parenta056fb3687c40b8a1123de1586f491285cb5fb1f (diff)
parentf2ab2a127d480ee20caf8620440ccf13c014447a (diff)
Merge remote branch 'stable/linux-2.6.32.y' into 2.6.32-mantismedia/2.6.32-mantis
Diffstat (limited to 'drivers/usb/serial/omninet.c')
-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 062265038bf..c116bd90e0e 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -317,7 +317,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);