Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 263e1f9f authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: io_ti: query hardware-buffer status in chars_in_buffer 



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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 810360a0

drivers/usb/serial/io_ti.c

+7 −0
Original line number Diff line number Diff line
@@ -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;
@@ -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;

}