Merge master.kernel.org:/home/rmk/linux-2.6-serial

git-mirror · Jul 1, 2005 · d471cd4 · d471cd4
2 parents bd53d12 + 44454bc
commit d471cd4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
@@ -2061,7 +2061,8 @@ static void __init serial8250_isa_init_ports(void)
 		up->port.ops = &serial8250_pops;
 	}
 
-	for (i = 0, up = serial8250_ports; i < ARRAY_SIZE(old_serial_port);
+	for (i = 0, up = serial8250_ports;
+	     i < ARRAY_SIZE(old_serial_port) && i < UART_NR;
 	     i++, up++) {
 		up->port.iobase   = old_serial_port[i].port;
 		up->port.irq      = irq_canonicalize(old_serial_port[i].irq);