diff options
author | Loic Poulain <loic.poulain@intel.com> | 2014-04-24 11:38:56 +0200 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-06 11:40:21 +0200 |
commit | 9ebff4b62caaf11ad6a701f8c4905411410b7728 (patch) | |
tree | b2a55db31d2cbebc9edf2d34b18dbfd954a79f15 /drivers/tty | |
parent | e5ffcda2cdc477940a4f86ff7f60316d4d3703f6 (diff) |
8250_core: Fix unwanted TX chars write
commit b08c9c317e3f7764a91d522cd031639ba42b98cc upstream.
On transmit-hold-register empty, serial8250_tx_chars
should be called only if we don't use DMA.
DMA has its own tx cycle.
Signed-off-by: Loic Poulain <loic.poulain@intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/8250/8250_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index aa6db8f4ee18..bf9d2ac9c9ed 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -1520,7 +1520,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) status = serial8250_rx_chars(up, status); } serial8250_modem_status(up); - if (status & UART_LSR_THRE) + if (!up->dma && (status & UART_LSR_THRE)) serial8250_tx_chars(up); spin_unlock_irqrestore(&port->lock, flags); |