Merge 6.10-rc6 into tty-next

[J-linux.git] / drivers / tty / serial / imx.c

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index f5cfe5571e0e088d744f0d7b47cafb016caef3a4..d96f0524f7fb25c66cbe0de5f0d54c893ea769d0 100644 (file)
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1957,8 +1957,10 @@ static int imx_uart_rs485_config(struct uart_port *port, struct ktermios *termio
 
        /* Make sure Rx is enabled in case Tx is active with Rx disabled */
        if (!(rs485conf->flags & SER_RS485_ENABLED) ||
-           rs485conf->flags & SER_RS485_RX_DURING_TX)
+           rs485conf->flags & SER_RS485_RX_DURING_TX) {
+               imx_uart_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT);
                imx_uart_start_rx(port);
+       }
 
        return 0;
 }