浏览代码

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

Linus Torvalds 20 年之前
父节点
当前提交
d471cd4787
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/serial/8250.c

+ 2 - 1
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);