SERIAL: omap: configure xon/xoff before setting modem control lines

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 17babde8febfa73f72f31659163eff79321921ba..9f54cef56765b4631b86491f528c77432cf238bc 100644 (file)
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -983,11 +983,12 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
                serial_out(up, UART_LCR, cval);
        }
 
-       serial_omap_set_mctrl(&up->port, up->port.mctrl);
        /* Software Flow Control Configuration */
        if (up->port.flags & UPF_SOFT_FLOW)
                serial_omap_configure_xonxoff(up, termios);
 
+       serial_omap_set_mctrl(&up->port, up->port.mctrl);
+
        spin_unlock_irqrestore(&up->port.lock, flags);
        pm_runtime_mark_last_busy(up->dev);
        pm_runtime_put_autosuspend(up->dev);