diff options
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index a5e61097668..8f78d7b8e88 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -309,10 +309,14 @@ static int usb_serial_generic_write_start(struct usb_serial_port *port) /* don't have to grab the lock here, as we will retry if != 0 */ port->write_urb_busy = 0; - } else - result = count; + return result; + } - return result; + spin_lock_irqsave(&port->lock, flags); + port->tx_bytes_flight += count; + spin_unlock_irqrestore(&port->lock, flags); + + return count; } /** @@ -400,7 +404,7 @@ int usb_serial_generic_chars_in_buffer(struct tty_struct *tty) if (serial->type->max_in_flight_urbs) chars = port->tx_bytes_flight; else - chars = kfifo_len(&port->write_fifo); + chars = kfifo_len(&port->write_fifo) + port->tx_bytes_flight; spin_unlock_irqrestore(&port->lock, flags); dbg("%s - returns %d", __func__, chars); @@ -510,7 +514,10 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb) port->urbs_in_flight = 0; spin_unlock_irqrestore(&port->lock, flags); } else { + spin_lock_irqsave(&port->lock, flags); + port->tx_bytes_flight -= urb->transfer_buffer_length; port->write_urb_busy = 0; + spin_unlock_irqrestore(&port->lock, flags); if (status) kfifo_reset_out(&port->write_fifo); |