diff options
| author | Karsten Keil <kkeil@suse.de> | 2009-02-03 15:18:01 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-12 09:31:01 -0800 |
| commit | b8863dd91d9bdd57efaeb3b47c6466b3a7c1b031 (patch) | |
| tree | a56bb6472b87e4c3fe9a702e8941e5bdadc89e4a /drivers/net | |
| parent | c6ac5fe00250faed88fb258d7ec91ec99bbe1e95 (diff) | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |