From 603a96e7c18ba476662814d81428ee409f41d55b Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 5 Oct 2012 22:26:06 +0100 Subject: [PATCH] --- yaml --- r: 339172 b: refs/heads/master c: 820344fe3de78e9fdc7691cd6076703683f5a6f4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/omap-serial.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ebc76d688a8a..5dcb27f07fe1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd9980c761d4ea15a51ce2aaf5dd9dddc299519e +refs/heads/master: 820344fe3de78e9fdc7691cd6076703683f5a6f4 diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c index 17babde8febf..9f54cef56765 100644 --- a/trunk/drivers/tty/serial/omap-serial.c +++ b/trunk/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);