diff --git a/[refs] b/[refs]
index 3cc5c7911c0a..a6cedc2160db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f31ad92f34913043cf008d6e479e92dfbaf02df1
+refs/heads/master: 05d81d2222beec7b63ac8c1c8cdb5bb4f82c2bad
diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c
index 1bc00b721e9d..be95e55b228b 100644
--- a/trunk/drivers/serial/8250.c
+++ b/trunk/drivers/serial/8250.c
@@ -2623,6 +2623,9 @@ static struct console serial8250_console = {
 
 static int __init serial8250_console_init(void)
 {
+	if (nr_uarts > UART_NR)
+		nr_uarts = UART_NR;
+
 	serial8250_isa_init_ports();
 	register_console(&serial8250_console);
 	return 0;