---

yaml --- r: 121980 b: refs/heads/master c: 438b365 h: refs/heads/master v: v3
git-mirror · Nov 22, 2008 · 4a8c21c · 4a8c21c
1 parent fe9f2e8
commit 4a8c21c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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));