From e4c8bbe1b1457cbf998c48e02cec03efcf9bd2e8 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Mon, 26 Jul 2010 12:20:43 +0000
Subject: [PATCH] --- yaml --- r: 203754 b: refs/heads/master c:
 ea7afd31fb45d2d5d1b1e4cf347a688370feee91 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c55493d3b9c6..5b3e8db4ef07 100644
--- 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
index 6aa795a6160b..afd01295fbec 100644
--- 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));