diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-10 14:39:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-28 14:07:04 -0800 |
| commit | d70a7b1626d64c8c57fb9258a81f427198b60700 (patch) | |
| tree | 1f5bee23483bbc50d1d49ee3fd13dc23168f1b3b /drivers | |
| parent | 6a597a38cbaf067019db96645f36e0b1f01f306a (diff) | |
| download | linux-d70a7b1626d64c8c57fb9258a81f427198b60700.tar.gz linux-d70a7b1626d64c8c57fb9258a81f427198b60700.tar.bz2 linux-d70a7b1626d64c8c57fb9258a81f427198b60700.zip | |
serial: 8250: Unlink uart console ptr if console setup fails
If console setup fails (eg., there is no valid port at that index),
unlink the console ptr; otherwise, when the driver unloads, the
console will be unregistered (even though setup, and thus registration,
failed) and a console disabled message will be printed.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/8250/8250_core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index c9720a97a977..8031e428894f 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -597,6 +597,7 @@ static void univ8250_console_write(struct console *co, const char *s, static int univ8250_console_setup(struct console *co, char *options) { struct uart_port *port; + int retval; /* * Check whether an invalid uart number has been specified, and @@ -609,7 +610,10 @@ static int univ8250_console_setup(struct console *co, char *options) /* link port to console */ port->cons = co; - return serial8250_console_setup(port, options, false); + retval = serial8250_console_setup(port, options, false); + if (retval != 0) + port->cons = NULL; + return retval; } /** |