commit d28122a5877cc40350fa801353fd5a9350563ec3
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon Jan 22 18:59:42 2007 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Jan 24 11:59:57 2007 +0000
tree e06ed644c3fe537f35dfd87e8acebffe7f1b8e4f
parent 7f215abc69302dc027f024fe656e4841063e8fe8

[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>

drivers/serial/amba-pl011.c

diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 9a3b374..44639e7 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -661,6 +661,8 @@
 	if (co->index >= UART_NR)
 		co->index = 0;
 	uap = amba_ports[co->index];
+	if (!uap)
+		return -ENODEV;
 
 	uap->port.uartclk = clk_get_rate(uap->clk);