From: Sebastian Andrzej Siewior Date: Wed, 10 Sep 2014 19:30:00 +0000 (+0200) Subject: tty: serial: 8250_core: remove UART_IER_RDI in serial8250_stop_rx() X-Git-Tag: v3.18-rc1~129^2~18 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9137568e73c1d132bc786676d9c4e00b91a1c627;p=linux.git 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 Reviewed-by: Tony Lindgren Tested-by: Tony Lindgren Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Greg Kroah-Hartman --- 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);