: e1000: error out if we cannot enable PCI device on resume

PATCH New Auke Kok 1 participant 1 message Aug 21, 2006

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Auke Kok

author

2006-08-21 21:35 UTC #0 lore raw

PATCH 1/1 : e1000: error out if we cannot enable PCI device on resume

FYI, in light of the recent error handling patches. I'll stack the outstanding list submitted by Vasily Averin to our git repository for submission to #upstream.

Cheers,

Auke

---

 e1000_main.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

---

e1000: error out if we cannot enable PCI device on resume

Do not ignore errors returned by pci_enable_device, instead error out.

Signed-off-by Auke Kok <[email protected]>

drivers/net/e1000/e1000_main.c +5 -2

index 815abe5..7805d7f 100644
@@ -4695,11 +4695,14 @@ e1000_resume(struct pci_dev *pdev)
 {
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct e1000_adapter *adapter = netdev_priv(netdev);
-	uint32_t manc, ret_val;
+	uint32_t manc, err;
 
 	pci_set_power_state(pdev, PCI_D0);
 	e1000_pci_restore_state(adapter);
-	ret_val = pci_enable_device(pdev);
+	if ((err = pci_enable_device(pdev))) {
+		printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n");
+		return err;
+	}
 	pci_set_master(pdev);
 
 	pci_enable_wake(pdev, PCI_D3hot, 0);