diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 18:57:54 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 18:57:54 +0300 |
| commit | 11cca3d12f03c670a6dd14004d40580918898760 (patch) | |
| tree | 495a745eaf5c44d08f8b1fb01b61733dc0e78c70 /drivers/tty/serial/8250/8250_port.c | |
| parent | a2d6a987bfe4a2e344fae9d255200072eb082427 (diff) | |
| parent | 49def1853334396f948dcb4cedb9347abb318df5 (diff) | |
| download | linux-11cca3d12f03c670a6dd14004d40580918898760.tar.xz | |
Merge 4.10-rc4 into tty-next
We want the serial/tty fixes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250/8250_port.c')
| -rw-r--r-- | drivers/tty/serial/8250/8250_port.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index f88028a62f23..ec6b5e3dcaaa 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1422,7 +1422,7 @@ static void __do_stop_tx_rs485(struct uart_8250_port *p) * Enable previously disabled RX interrupts. */ if (!(p->port.rs485.flags & SER_RS485_RX_DURING_TX)) { - serial8250_clear_fifos(p); + serial8250_clear_and_reinit_fifos(p); p->ier |= UART_IER_RLSI | UART_IER_RDI; serial_port_out(&p->port, UART_IER, p->ier); |