aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2015-05-19 10:25:14 +0100
committerGraeme Gregory <graeme.gregory@linaro.org>2015-05-19 10:42:09 +0100
commit6fad3ac6a73d6ec7f1c664d9305473efebcee04d (patch)
treecd8308e18c5bd74ae697c0dfdf8770b6eca3d546
parent35610d2a4ee9ec9e0345c0b9bb096b981ea55ba7 (diff)
pl011: sbsa mode fedora login fix/kludgeleg-20150519.0
From http://lists.infradead.org/pipermail/linux-arm-kernel/2015-May/343042.html Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
-rw-r--r--drivers/tty/serial/amba-pl011.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 79f716c977dd..8e10358d4ab4 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1924,7 +1924,7 @@ sbsa_uart_set_termios(struct uart_port *port, struct ktermios *termios,
container_of(port, struct uart_amba_port, port);
unsigned long flags;
- if (old)
+ if (old && old->c_cflag)
tty_termios_copy_hw(termios, old);
tty_termios_encode_baud_rate(termios, uap->fixed_baud, uap->fixed_baud);