summaryrefslogtreecommitdiff
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2018-02-03 11:27:23 (GMT)
committer jie.yuan <jie.yuan@amlogic.com>2018-04-03 05:57:48 (GMT)
commitb42b8b8320047c27656caccc9f9ea2cc0bed88e5 (patch)
tree114e6f8c6fcc36e53f0e82a79cd9b9ff88572d95
parent352d6fd61e8332d8c6503c69aaf7999d9c059a6a (diff)
downloadcommon-b42b8b8320047c27656caccc9f9ea2cc0bed88e5.zip
common-b42b8b8320047c27656caccc9f9ea2cc0bed88e5.tar.gz
common-b42b8b8320047c27656caccc9f9ea2cc0bed88e5.tar.bz2
serial: core: mark port as initialized in autoconfig
PD#163025: fix pwq null pointer commit 714569064adee3c114a2a6490735b94abe269068 upstream. This is a followup on 44117a1d1732 ("serial: core: mark port as initialized after successful IRQ change"). Nikola has been using autoconfig via setserial and reported a crash similar to what I fixed in the earlier mentioned commit. Here I do the same fixup for the autoconfig. I wasn't sure that this is the right approach. Nikola confirmed that it fixes his crash. Change-Id: I33f2d6abd165db80a23eafe812634475e9b62865 Fixes: b3b576461864 ("tty: serial_core: convert uart_open to use tty_port_open") Link: http://lkml.kernel.org/r/20180131072000.GD1853@localhost.localdomain Reported-by: Nikola Ciprich <nikola.ciprich@linuxbox.cz> Tested-by: Nikola Ciprich <nikola.ciprich@linuxbox.cz> Cc: <stable@vger.kernel.org> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Tested-by: Nikola Ciprich <nikola.ciprich@linuxbox.cz> Acked-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat
-rw-r--r--drivers/tty/serial/serial_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 2e2b88a..70ad5fe 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1136,6 +1136,8 @@ static int uart_do_autoconfig(struct tty_struct *tty,struct uart_state *state)
uport->ops->config_port(uport, flags);
ret = uart_startup(tty, state, 1);
+ if (ret == 0)
+ tty_port_set_initialized(port, true);
if (ret > 0)
ret = 0;
}