diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-07-01 02:04:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-07-01 02:04:54 +0200 |
| commit | d471cd4787351c05d6be749475418ccea2720ef4 (patch) | |
| tree | 378ee9dac650f2cf7ee883f156df1c60b3661d28 | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
| parent | [PATCH] Serial: Fix small CONFIG_SERIAL_8250_NR_UARTS (diff) | |
| download | linux-d471cd4787351c05d6be749475418ccea2720ef4.tar.xz linux-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 9224fc3184ea..7e8fc7c1d4cc 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); |