1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 77f035158d6c..dd8b1a5458ff 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -342,7 +342,14 @@ static void serial_omap_stop_tx(struct uart_port *port)
 
         if ((up->rs485.flags & SER_RS485_ENABLED) &&
             !(up->rs485.flags & SER_RS485_RX_DURING_TX)) {
-                up->ier = UART_IER_RLSI | UART_IER_RDI;
+                /*
+                 * Empty the RX FIFO, we are not interested in anything
+                 * received during the half-duplex transmission.
+                 */
+                serial_out(up, UART_FCR, up->fcr | UART_FCR_CLEAR_RCVR);
+                /* Re-enable RX interrupts */
+                up->ier |= UART_IER_RLSI | UART_IER_RDI;
+                up->port.read_status_mask |= UART_LSR_DR;
                 serial_out(up, UART_IER, up->ier);
         }
 
@@ -355,7 +362,7 @@ static void serial_omap_stop_rx(struct uart_port *port)
         struct uart_omap_port *up = to_uart_omap_port(port);
 
         pm_runtime_get_sync(up->dev);
-        up->ier &= ~UART_IER_RLSI;
+        up->ier &= ~(UART_IER_RLSI | UART_IER_RDI);
         up->port.read_status_mask &= ~UART_LSR_DR;
         serial_out(up, UART_IER, up->ier);
         pm_runtime_mark_last_busy(up->dev);