Merge bk://bk.arm.linux.org.uk/linux-2.6-serial

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
9f7a3b76 · Linus Torvalds · 8cbc52d2 · 7bc8d827 · 9f7a3b76
Commit 9f7a3b76 authored May 02, 2004 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/serial/8250_pci.c drivers/serial/8250_pci.c +1 -1

No files found.
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -525,7 +525,7 @@ pci_default_setup(struct pci_dev *dev, struct pci_board *board,
 	else
 		offset += idx * board->uart_offset;

-	maxnr = (pci_resource_len(dev, bar) - board->uart_offset) /
+	maxnr = (pci_resource_len(dev, bar) - board->first_offset) /
 		(8 << board->reg_shift);

 	if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)