From 96b8c196a631c7332aab0094126ade8f7f93b6fb Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Mon, 14 Jan 2013 16:52:57 +0100 Subject: [PATCH] --- yaml --- r: 354570 b: refs/heads/master c: 263e1f9fbb999fb78df5bfed87ddbba1c12ee0f1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/io_ti.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4b5f7dd76bde..a3b9058c8686 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 810360a03597afc0d43a45798a52cfb69b8453d3 +refs/heads/master: 263e1f9fbb999fb78df5bfed87ddbba1c12ee0f1 diff --git a/trunk/drivers/usb/serial/io_ti.c b/trunk/drivers/usb/serial/io_ti.c index 3abbdaad838d..590f27d3bfc1 100644 --- a/trunk/drivers/usb/serial/io_ti.c +++ b/trunk/drivers/usb/serial/io_ti.c @@ -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; }