aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2010-07-26 08:20:43 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-26 21:42:52 -0400
commitea7afd31fb45d2d5d1b1e4cf347a688370feee91 (patch)
treec0f8995a0bb7a66df070944bf039df284967aac5 /drivers/net/e1000e
parentd7f61777e9ec6951e99fb6fe06ba956b9bc4bbab (diff)
e1000e: Drop a useless statement
err is set again a few lines below. Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jean Delvare <jdelvare@suse.de> Acked-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>
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r--drivers/net/e1000e/netdev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 6aa795a6160b..afd01295fbec 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -5650,8 +5650,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
5650 if (err) 5650 if (err)
5651 goto err_sw_init; 5651 goto err_sw_init;
5652 5652
5653 err = -EIO;
5654
5655 memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops)); 5653 memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops));
5656 memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops)); 5654 memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops));
5657 memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops)); 5655 memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));