diff options
-rw-r--r-- | drivers/tty/serial/8250/8250_core.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index e3b9570a1eff..deae122c9c4b 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c | |||
@@ -2138,8 +2138,8 @@ int serial8250_do_startup(struct uart_port *port) | |||
2138 | /* | 2138 | /* |
2139 | * Clear the interrupt registers. | 2139 | * Clear the interrupt registers. |
2140 | */ | 2140 | */ |
2141 | if (serial_port_in(port, UART_LSR) & UART_LSR_DR) | 2141 | serial_port_in(port, UART_LSR); |
2142 | serial_port_in(port, UART_RX); | 2142 | serial_port_in(port, UART_RX); |
2143 | serial_port_in(port, UART_IIR); | 2143 | serial_port_in(port, UART_IIR); |
2144 | serial_port_in(port, UART_MSR); | 2144 | serial_port_in(port, UART_MSR); |
2145 | 2145 | ||
@@ -2300,8 +2300,8 @@ dont_test_tx_en: | |||
2300 | * saved flags to avoid getting false values from polling | 2300 | * saved flags to avoid getting false values from polling |
2301 | * routines or the previous session. | 2301 | * routines or the previous session. |
2302 | */ | 2302 | */ |
2303 | if (serial_port_in(port, UART_LSR) & UART_LSR_DR) | 2303 | serial_port_in(port, UART_LSR); |
2304 | serial_port_in(port, UART_RX); | 2304 | serial_port_in(port, UART_RX); |
2305 | serial_port_in(port, UART_IIR); | 2305 | serial_port_in(port, UART_IIR); |
2306 | serial_port_in(port, UART_MSR); | 2306 | serial_port_in(port, UART_MSR); |
2307 | up->lsr_saved_flags = 0; | 2307 | up->lsr_saved_flags = 0; |
@@ -2394,8 +2394,7 @@ void serial8250_do_shutdown(struct uart_port *port) | |||
2394 | * Read data port to reset things, and then unlink from | 2394 | * Read data port to reset things, and then unlink from |
2395 | * the IRQ chain. | 2395 | * the IRQ chain. |
2396 | */ | 2396 | */ |
2397 | if (serial_port_in(port, UART_LSR) & UART_LSR_DR) | 2397 | serial_port_in(port, UART_RX); |
2398 | serial_port_in(port, UART_RX); | ||
2399 | serial8250_rpm_put(up); | 2398 | serial8250_rpm_put(up); |
2400 | 2399 | ||
2401 | del_timer_sync(&up->timer); | 2400 | del_timer_sync(&up->timer); |