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

[Auke Kok <auke-jan.h.kok@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]


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(-)
---


[-- Attachment #2: e1000_trap_error_on_resume.patch --]
[-- Type: text/x-patch, Size: 890 bytes --]


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 <auke-jan.h.kok@intel.com>

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 815abe5..7805d7f 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -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);