From: Bruce Allan <bruce.w.allan@intel.com>
Date: Sat, 22 Nov 2008 00:51:33 +0000 (-0800)
Subject: e1000e: check return of pci_save_state
X-Git-Tag: v2.6.29-rc1~581^2~588
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=438b365a2758c012393a7be24d31a9c06aa0a504;p=linux-2.6-omap-h63xx.git

e1000e: check return of pci_save_state

Check return of pci_save_state and error out accordingly.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index ebbb9f061c8..ae6dce584d8 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4802,7 +4802,10 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 		goto err_pci_reg;
 
 	pci_set_master(pdev);
-	pci_save_state(pdev);
+	/* PCI config space info */
+	err = pci_save_state(pdev);
+	if (err)
+		goto err_alloc_etherdev;
 
 	err = -ENOMEM;
 	netdev = alloc_etherdev(sizeof(struct e1000_adapter));