From 820344fe3de78e9fdc7691cd6076703683f5a6f4 Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 5 Oct 2012 22:26:06 +0100 Subject: SERIAL: omap: configure xon/xoff before setting modem control lines Signed-off-by: Russell King --- drivers/tty/serial/omap-serial.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/tty') diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 17babde..9f54cef 100644 --- 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); -- cgit v1.1