From: Johan Hovold Date: Sun, 6 Nov 2011 18:06:21 +0000 (+0100) Subject: USB: omninet: fix write_room X-Git-Tag: v2.6.32.54~7 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0630cde299f9ad4c6c062e0ac44778f4dfcc6e5e;p=linux-pvops.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index 062265038bf0..c116bd90e0e1 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);