summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-10-05 22:26:06 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-11-04 12:14:22 +0000
commit820344fe3de78e9fdc7691cd6076703683f5a6f4 (patch)
tree726284d4fe747d3085f5d36d9db26554967916a1 /drivers/tty
parentfd9980c761d4ea15a51ce2aaf5dd9dddc299519e (diff)
downloadop-kernel-dev-820344fe3de78e9fdc7691cd6076703683f5a6f4.zip
op-kernel-dev-820344fe3de78e9fdc7691cd6076703683f5a6f4.tar.gz
SERIAL: omap: configure xon/xoff before setting modem control lines
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/omap-serial.c3
1 files changed, 2 insertions, 1 deletions
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);
OpenPOWER on IntegriCloud