diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 17:04:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 17:04:54 -0700 |
| commit | d471cd4787351c05d6be749475418ccea2720ef4 (patch) | |
| tree | 378ee9dac650f2cf7ee883f156df1c60b3661d28 | |
| parent | bd53d1270f51c6cfb53b06c8f93fd42327871d6b (diff) | |
| parent | 44454bcdb90532b372c74e3546043d8a3a468939 (diff) | |
| download | linux-3.10-d471cd4787351c05d6be749475418ccea2720ef4.tar.gz linux-3.10-d471cd4787351c05d6be749475418ccea2720ef4.tar.bz2 linux-3.10-d471cd4787351c05d6be749475418ccea2720ef4.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -rw-r--r-- | drivers/serial/8250.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 9224fc3184e..7e8fc7c1d4c 100644 --- 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); |