---

yaml --- r: 203754 b: refs/heads/master c: ea7afd3 h: refs/heads/master v: v3
git-mirror · Jul 27, 2010 · e4c8bbe · e4c8bbe
1 parent 3ef9391
commit e4c8bbe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7f61777e9ec6951e99fb6fe06ba956b9bc4bbab
+refs/heads/master: ea7afd31fb45d2d5d1b1e4cf347a688370feee91
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
@@ -5650,8 +5650,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
 	if (err)
 		goto err_sw_init;
 
-	err = -EIO;
-
 	memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
 	memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
 	memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));