diff options
| author | Thomas Abraham <thomas.ab@samsung.com> | 2011-06-14 19:12:26 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-07-07 09:10:21 +0900 |
| commit | ee430f16251de889ddf8e303970713d9fba9a3f5 (patch) | |
| tree | 9edac4feded77be8eccc5f8304aca8d1f1eae924 /drivers/tty/serial/samsung.c | |
| parent | 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff) | |
| download | linux-ee430f16251de889ddf8e303970713d9fba9a3f5.tar.gz linux-ee430f16251de889ddf8e303970713d9fba9a3f5.tar.bz2 linux-ee430f16251de889ddf8e303970713d9fba9a3f5.zip | |
serial: samsung: Fix unintended usage of uart port 0 as console
In s3c24xx_serial_console_setup function, if the uart port that is
being setup as a console has not been initialized, an error can be
returned instead of using uart port 0 as the default console port.
The uart port that was intended to be used as a console could be
initialized at a later point during boot and then registered as a
console. This will avoid using uart port 0 as a unintended console
port.
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'drivers/tty/serial/samsung.c')
| -rw-r--r-- | drivers/tty/serial/samsung.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index f66f64829303..014c1c3923e8 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1416,10 +1416,8 @@ s3c24xx_serial_console_setup(struct console *co, char *options) /* is the port configured? */ - if (port->mapbase == 0x0) { - co->index = 0; - port = &s3c24xx_serial_ports[co->index].port; - } + if (port->mapbase == 0x0) + return -ENODEV; cons_uart = port; |