1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 0e0c2740ec7e..aed19c688beb 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -955,15 +955,23 @@ static void max310x_set_termios(struct uart_port *port,
         /* Configure flow control */
         max310x_port_write(port, MAX310X_XON1_REG, termios->c_cc[VSTART]);
         max310x_port_write(port, MAX310X_XOFF1_REG, termios->c_cc[VSTOP]);
-        if (termios->c_cflag & CRTSCTS)
+
+        port->status &= ~(UPSTAT_AUTOCTS | UPSTAT_AUTORTS | UPSTAT_AUTOXOFF);
+
+        if (termios->c_cflag & CRTSCTS) {
+                /* Enable AUTORTS and AUTOCTS */
+                port->status |= UPSTAT_AUTOCTS | UPSTAT_AUTORTS;
                 flow |= MAX310X_FLOWCTRL_AUTOCTS_BIT |
                         MAX310X_FLOWCTRL_AUTORTS_BIT;
+        }
         if (termios->c_iflag & IXON)
                 flow |= MAX310X_FLOWCTRL_SWFLOW3_BIT |
                         MAX310X_FLOWCTRL_SWFLOWEN_BIT;
-        if (termios->c_iflag & IXOFF)
+        if (termios->c_iflag & IXOFF) {
+                port->status |= UPSTAT_AUTOXOFF;
                 flow |= MAX310X_FLOWCTRL_SWFLOW1_BIT |
                         MAX310X_FLOWCTRL_SWFLOWEN_BIT;
+        }
         max310x_port_write(port, MAX310X_FLOWCTRL_REG, flow);
 
         /* Get baud rate generator configuration */