diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-06 11:08:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-06 11:08:02 +0100 |
| commit | ebb1d078e4a8f9f2e9d1c822823671d5131fc42f (patch) | |
| tree | be9269a9723668f009a352503137325f9e65093d /drivers/tty | |
| parent | ec07e110ab9dce68c6125ada0cbb0907856fe6be (diff) | |
| parent | a8d97b1bd0c91fbc1be54d068b5f051b4f70b4f7 (diff) | |
Merge tag 'v3.10.54' into linux-linaro-lsk
This is the 3.10.54 stable release
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index f87dbfd32770..0f1cc2c8c22a 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -241,6 +241,9 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state) /* * Turn off DTR and RTS early. */ + if (uart_console(uport) && tty) + uport->cons->cflag = tty->termios.c_cflag; + if (!tty || (tty->termios.c_cflag & HUPCL)) uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS); |