From: Karsten Keil <kkeil@suse.de>
Date: Tue, 3 Feb 2009 23:18:01 +0000 (-0800)
Subject: e1000: Fix PCI enable to honor the need_ioport flag
X-Git-Tag: v2.6.27.16~50
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=b8863dd91d9bdd57efaeb3b47c6466b3a7c1b031;p=unionfs-2.6.25.y.git

e1000: Fix PCI enable to honor the need_ioport flag

commit 4d7155b932b8129c72e2f2714890e20b2a05e0b7 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 798e2b2bdf1..6b963572df2 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -927,7 +927,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;