From 4a8c21c09b6c718c82bcd834c21c67375239ea6d Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Fri, 21 Nov 2008 16:51:33 -0800
Subject: [PATCH] --- yaml --- r: 121980 b: refs/heads/master c:
 438b365a2758c012393a7be24d31a9c06aa0a504 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/e1000e/netdev.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 03ae3b9ed423..216c8beef5fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1605927fcee41fe205f1713725f47f0d52978489
+refs/heads/master: 438b365a2758c012393a7be24d31a9c06aa0a504
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index ebbb9f061c87..ae6dce584d85 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/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));