diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-06 11:08:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-06 11:08:32 +0100 |
| commit | 4fdaee37b59a97c2f08abfe351e0255e5bf7008e (patch) | |
| tree | 71808e8fc7b9bcb66296b40436dd39a5a9111fa5 /drivers/tty | |
| parent | dd8f573aa50f7902609dfbbb4e0a67149e875a16 (diff) | |
| parent | ebb1d078e4a8f9f2e9d1c822823671d5131fc42f (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rt
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); |