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

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://bk.arm.linux.org.uk/linux-2.5-serial
into home.transmeta.com:/home/torvalds/v2.5/linux
d1f880ab · Linus Torvalds · 8cd13562 · 1e5c102c · d1f880ab
Commit d1f880ab authored Apr 29, 2003 by Linus Torvalds
Hide 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
@@ -127,7 +127,7 @@ setup_port(struct pci_dev *dev, struct serial_struct *req,
 			return -ENOMEM;

 		req->io_type = UPIO_MEM;
-		req->iomap_base = port;
+		req->iomap_base = port + offset;
 		req->iomem_base = priv->remapped_bar[bar] + offset;
 		req->iomem_reg_shift = regshift;
 	} else {