lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2005-06-30 17:04:54 -07:00
parent bd53d1270f 44454bcdb9
commit d471cd4787
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/serial/8250.c
View File

@@ -2061,7 +2061,8 @@ static void __init serial8250_isa_init_ports(void)
up->port.ops = &serial8250_pops; 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++) { i++, up++) {
up->port.iobase = old_serial_port[i].port; up->port.iobase = old_serial_port[i].port;
up->port.irq = irq_canonicalize(old_serial_port[i].irq); up->port.irq = irq_canonicalize(old_serial_port[i].irq);