summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2005-12-17 00:49:53 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-12-24 16:05:50 +0100
commitc8cb00f6ac9aa13b0575726163b165fd2276ff25 (patch)
tree62dafcea2b222a2425d7a580c8678def4d578277 /drivers
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-c8cb00f6ac9aa13b0575726163b165fd2276ff25.tar.xz
linux-c8cb00f6ac9aa13b0575726163b165fd2276ff25.zip
[PATCH] orinoco_nortel: Fix incorrect PCI resource use
orinoco_nortel was broken during conversion to iomem API. Wrong PCI BAR is used for chipset registers. Reported by Tomas Novak <tap@post.cz> Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/orinoco_nortel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c
index d8afd51ff8a5..e39c08b88700 100644
--- a/drivers/net/wireless/orinoco_nortel.c
+++ b/drivers/net/wireless/orinoco_nortel.c
@@ -165,7 +165,7 @@ static int nortel_pci_init_one(struct pci_dev *pdev,
goto fail_resources;
}
- iomem = pci_iomap(pdev, 3, 0);
+ iomem = pci_iomap(pdev, 2, 0);
if (!iomem) {
err = -ENOMEM;
goto fail_map_io;