aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorKarsten Keil <kkeil@suse.de>2009-02-03 15:18:01 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-03 15:18:01 -0800
commit4d7155b932b8129c72e2f2714890e20b2a05e0b7 (patch)
tree7d94cfea5239cc6b11673e326f7a1851720921ed /drivers/net
parent714c48f1bb553a2e5dd8d6ff66accc7c51218ac9 (diff)
e1000: Fix PCI enable to honor the need_ioport flag
On machine were no IO ports are assigned the call to pci_enable_device() will fail, even if need_ioport is false, we need to use pci_enable_device_mem() here. Signed-off-by: Karsten Keil <kkeil@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e1000/e1000_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index c986978ce76..6bd63cc67b3 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -940,7 +940,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
err = pci_enable_device(pdev);
} else {
bars = pci_select_bars(pdev, IORESOURCE_MEM);
- err = pci_enable_device(pdev);
+ err = pci_enable_device_mem(pdev);
}
if (err)
return err;