e1000: Fix PCI enable to honor the need_ioport flag

Karsten Keil · davem330 · commit 4d7155b932b8 · 2009-02-03T15:18:01.000-08:00
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 &lt;kkeil@suse.de&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -940,7 +940,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,`
`940`	`940`	`err = pci_enable_device(pdev);`
`941`	`941`	`} else {`
`942`	`942`	`bars = pci_select_bars(pdev, IORESOURCE_MEM);`
`943`		`- err = pci_enable_device(pdev);`
	`943`	`+ err = pci_enable_device_mem(pdev);`
`944`	`944`	`}`
`945`	`945`	`if (err)`
`946`	`946`	`return err;`