diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-07 10:47:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-07 10:47:30 +1100 |
| commit | f83ffceb2d53bebbb07842e6f4ea42f2f5cd0e52 (patch) | |
| tree | 9a802466d784f53245cea56546408556dd4c5894 /drivers | |
| parent | 5a4c1876cb7d155d9371024fd36b9b015b3ef23e (diff) | |
| parent | 62de43e755c5a51777a7a59834ab733f47c3d59c (diff) | |
Merge branch 'quilt/usb.current'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/serial/generic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index f1ea3a33b6e6..5ce033ab9b99 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -386,12 +386,12 @@ int usb_serial_generic_chars_in_buffer(struct tty_struct *tty) dbg("%s - port %d", __func__, port->number); - if (serial->type->max_in_flight_urbs) { - spin_lock_irqsave(&port->lock, flags); + spin_lock_irqsave(&port->lock, flags); + if (serial->type->max_in_flight_urbs) chars = port->tx_bytes_flight; - spin_unlock_irqrestore(&port->lock, flags); - } else if (serial->num_bulk_out) + else if (serial->num_bulk_out) chars = kfifo_len(&port->write_fifo); + spin_unlock_irqrestore(&port->lock, flags); dbg("%s - returns %d", __func__, chars); return chars; |