diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:16:06 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:16:06 -0400 |
| commit | 5a476deff3d17093da39c4eccb2692ba714dcb11 (patch) | |
| tree | 16f5c745a3c8ac780a218ad3d43e32f33164bcf5 /drivers/usb/serial/generic.c | |
| parent | dd4efa44ebf2a8a0e5edf60a53eadec981b4b10a (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 2 |
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) | |||
| 223 | dbg("%s - port %d", __FUNCTION__, port->number); | 223 | dbg("%s - port %d", __FUNCTION__, port->number); |
| 224 | 224 | ||
| 225 | if (serial->num_bulk_out) { | 225 | if (serial->num_bulk_out) { |
| 226 | if (port->write_urb_busy) | 226 | if (!(port->write_urb_busy)) |
| 227 | room = port->bulk_out_size; | 227 | room = port->bulk_out_size; |
| 228 | } | 228 | } |
| 229 | 229 | ||