1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 6d3d26a607b9..b6a1925dfc92 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -921,6 +921,13 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
                 serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
                 serial_out(up, UART_MCR, up->mcr | UART_MCR_RTS);
                 serial_out(up, UART_LCR, cval);
+        } else {
+                /* Disable AUTORTS and AUTOCTS */
+                up->efr &= ~(UART_EFR_CTS | UART_EFR_RTS);
+
+                serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
+                serial_out(up, UART_EFR, up->efr);
+                serial_out(up, UART_LCR, cval);
         }
 
         serial_omap_set_mctrl(&up->port, up->port.mctrl);