Skip to content

Commit

Permalink
USB: io_ti: query hardware-buffer status in chars_in_buffer
Browse files Browse the repository at this point in the history
Query hardware-buffer status in chars_in_buffer should the write fifo be
empty.

This is needed to make the tty layer wait for hardware buffers to drain
on close.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Jan 18, 2013
1 parent 810360a commit 263e1f9
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/usb/serial/io_ti.c
Original file line number Diff line number Diff line change
Expand Up @@ -2088,6 +2088,7 @@ static int edge_chars_in_buffer(struct tty_struct *tty)
struct edgeport_port *edge_port = usb_get_serial_port_data(port);
int chars = 0;
unsigned long flags;
int ret;

if (edge_port == NULL)
return 0;
Expand All @@ -2098,6 +2099,12 @@ static int edge_chars_in_buffer(struct tty_struct *tty)
chars = kfifo_len(&edge_port->write_fifo);
spin_unlock_irqrestore(&edge_port->ep_lock, flags);

if (!chars) {
ret = tx_active(edge_port);
if (ret > 0)
chars = ret;
}

dev_dbg(&port->dev, "%s - returns %d\n", __func__, chars);
return chars;
}
Expand Down

0 comments on commit 263e1f9

Please sign in to comment.