1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 57d6e6ba556e..32f36d86a960 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -405,7 +405,12 @@ static void imx_uart_rts_inactive(struct imx_port *sport, u32 *ucr2)
 /* called with port.lock taken and irqs caller dependent */
 static void imx_uart_rts_auto(struct imx_port *sport, u32 *ucr2)
 {
-        *ucr2 |= UCR2_CTSC;
+        /*
+         * Only let receiver control RTS output if we were not requested to have
+         * RTS inactive (which then should take precedence).
+         */
+        if (*ucr2 & UCR2_CTS)
+                *ucr2 |= UCR2_CTSC;
 }
 
 /* called with port.lock taken and irqs off */