summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior2014-09-10 21:30:00 +0200
committerGreg Kroah-Hartman2014-09-26 18:01:56 +0200
commit9137568e73c1d132bc786676d9c4e00b91a1c627 (patch)
tree89ae398e6200d5d216a11100afeca9bc9de6c2a1 /drivers/tty/serial
parenttty: serial: 8250_core: use the ->line argument as a hint in serial8250_find_... (diff)
downloadkernel-qcow2-linux-9137568e73c1d132bc786676d9c4e00b91a1c627.tar.gz
kernel-qcow2-linux-9137568e73c1d132bc786676d9c4e00b91a1c627.tar.xz
kernel-qcow2-linux-9137568e73c1d132bc786676d9c4e00b91a1c627.zip
tty: serial: 8250_core: remove UART_IER_RDI in serial8250_stop_rx()
serial8250_do_startup() adds UART_IER_RDI and UART_IER_RLSI to ier. serial8250_stop_rx() should remove both. This is what the serial-omap driver has been doing and is now moved to the 8250-core since it does no look to be *that* omap specific. Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Tony Lindgren <tony@atomide.com> Tested-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r--drivers/tty/serial/8250/8250_core.c2
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 ac88e66df65d..139f3d2b8aa9 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -1390,7 +1390,7 @@ static void serial8250_stop_rx(struct uart_port *port)
serial8250_rpm_get(up);
- up->ier &= ~UART_IER_RLSI;
+ up->ier &= ~(UART_IER_RLSI | UART_IER_RDI);
up->port.read_status_mask &= ~UART_LSR_DR;
serial_port_out(port, UART_IER, up->ier);