tty: serial: Fix termios/port flags mismatch

Uart port drivers may reconfigure termios settings based on available
hardware support; set/clear ASYNC_CTS_FLOW and ASYNC_CHECK_CD _after_
calling the port driver's .set_termios method.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 1a5fbf7ab347d76c54dbca2704755d19ef58ddfb..b70095e55df694aba2c5e3c297824dfd2e8dcbe3 100644 (file)
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -450,6 +450,7 @@ static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
                return;
 
        termios = &tty->termios;
+       uport->ops->set_termios(uport, termios, old_termios);
 
        /*
         * Set flags based on termios cflag
@@ -463,8 +464,6 @@ static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
                clear_bit(ASYNCB_CHECK_CD, &port->flags);
        else
                set_bit(ASYNCB_CHECK_CD, &port->flags);
-
-       uport->ops->set_termios(uport, termios, old_termios);
 }
 
 static inline int __uart_put_char(struct uart_port *port,
@@ -1282,6 +1281,8 @@ static void uart_set_termios(struct tty_struct *tty,
        }
 
        uart_change_speed(tty, state, old_termios);
+       /* reload cflag from termios; port driver may have overriden flags */
+       cflag = tty->termios.c_cflag;
 
        /* Handle transition to B0 status */
        if ((old_termios->c_cflag & CBAUD) && !(cflag & CBAUD))