summaryrefslogtreecommitdiff
path: root/drivers/serial/amba-pl010.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-01-22 21:59:42 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-01-24 14:59:57 +0300
commitd28122a5877cc40350fa801353fd5a9350563ec3 (patch)
treee06ed644c3fe537f35dfd87e8acebffe7f1b8e4f /drivers/serial/amba-pl010.c
parent7f215abc69302dc027f024fe656e4841063e8fe8 (diff)
downloadlinux-d28122a5877cc40350fa801353fd5a9350563ec3.tar.xz
[ARM] Fix AMBA serial drivers for non-first serial ports
Using console=ttyAM1 or console=ttyAMA1 resulted in an oops during boot due to trying to drive the console before that port had been registered. Fix this by checking whether the port is present before allowing console setup to proceed. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial/amba-pl010.c')
-rw-r--r--drivers/serial/amba-pl010.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 61db6973755a..f69bd097166e 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -589,6 +589,8 @@ static int __init pl010_console_setup(struct console *co, char *options)
*/
if (co->index >= UART_NR)
co->index = 0;
+ if (!amba_ports[co->index])
+ return -ENODEV;
port = &amba_ports[co->index]->port;
if (options)