diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-27 16:02:18 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-27 16:02:18 -0700 |
| commit | 355fe568e285815e6f62fcd004ca80085ae46a69 (patch) | |
| tree | b148e91bee7008b8afb5369c49868e1814302c57 /drivers/tty/serial/omap-serial.c | |
| parent | Revert "serial: omap: Fix IRQ handling return value" (diff) | |
| download | linux-dev-355fe568e285815e6f62fcd004ca80085ae46a69.tar.xz linux-dev-355fe568e285815e6f62fcd004ca80085ae46a69.zip | |
Revert "OMAP: UART: Keep the TX fifo full when possible"
This reverts commit c4415084218c68c5ee2fc583431e89a78d896b19.
Kevin writes:
Hmm, another OMAP serial patch that wasn't Cc'd to linux-omap
where OMAP users might have seen it. :(
I just bisected a strange problem in linux-next on OMAP3 down to
this patch. Reverting it fixes the problem.
On OMAP3530 Beagle and Overo, after boot, doing a 'cat
/proc/cpuinfo' was not returning to a prompt, suggesting
something strange with the FIFO. Hitting return gets me back to
a prompt.
Greg, this one should also be dropped from tty-next until it can
be further investgated and the problem solved.
Reported-by: Kevin Hilman <khilman@linaro.org>
Cc: Dmitry Fink <finik@ti.com>
Cc: Alexander Savchenko <oleksandr.savchenko@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index b0f46e666e1a..816d1a23f9d0 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -350,8 +350,7 @@ static void transmit_chars(struct uart_omap_port *up, unsigned int lsr) serial_omap_stop_tx(&up->port); return; } - count = up->port.fifosize - - (serial_in(up, UART_OMAP_TXFIFO_LVL) & 0xFF); + count = up->port.fifosize / 4; do { serial_out(up, UART_TX, xmit->buf[xmit->tail]); xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); |