From: Karsten Keil Date: Tue, 3 Feb 2009 23:18:01 +0000 (-0800) Subject: e1000: Fix PCI enable to honor the need_ioport flag X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4d7155b932b8129c72e2f2714890e20b2a05e0b7;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: David S. Miller --- 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;