diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-05 23:26:06 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-04 13:14:22 +0100 |
| commit | 820344fe3de78e9fdc7691cd6076703683f5a6f4 (patch) | |
| tree | 726284d4fe747d3085f5d36d9db26554967916a1 /drivers/tty | |
| parent | SERIAL: omap: remove OMAP_UART_SYSC_RESET and OMAP_UART_FIFO_CLR (diff) | |
| download | linux-820344fe3de78e9fdc7691cd6076703683f5a6f4.tar.xz linux-820344fe3de78e9fdc7691cd6076703683f5a6f4.zip | |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 17babde8febf..9f54cef56765 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); |