X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fserial%2F8250.c;h=be95e55b228b83077ace9af42764d75f8a286d11;hb=751851af7aae9b8bd5a60b3897209081fbc18b2b;hp=a1ca9b7bf2d5862b7466fbdcee4f5099b882ac76;hpb=2c4aabcca847ac4c92aa5e960c3f6053e1051b62;p=linux-2.6

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index a1ca9b7bf2..be95e55b22 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -93,7 +93,6 @@ static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;
 #define CONFIG_HUB6 1
 
 #include <asm/serial.h>
-
 /*
  * SERIAL_PORT_DFNS tells us about built-in ports that have no
  * standard enumeration mechanism.   Platforms that can find all
@@ -2624,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;