aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2006-02-07 01:50:45 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-07 01:50:45 -0500
commit471ef051bc3b980e2f38cbe9112eac7bfe4d6633 (patch)
tree05f8ab666ba3c3ff7964b8a6551707977ada9177 /drivers/net
parentc03296a868ae7c91aa2d8b372184763b18f16d7a (diff)
e100: remove init_hw call to fix panic
e100 seems to have had a long standing bug where e100_init_hw was being called when it should not have been. This caused a panic due to recent changes that rely on correct set up in the driver, and more robust error paths. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e100.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index bf1fd2b98bf..24253c807e5 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2752,8 +2752,6 @@ static int e100_resume(struct pci_dev *pdev)
retval = pci_enable_wake(pdev, 0, 0);
if (retval)
DPRINTK(PROBE,ERR, "Error clearing wake events\n");
- if(e100_hw_init(nic))
- DPRINTK(HW, ERR, "e100_hw_init failed\n");
netif_device_attach(netdev);
if(netif_running(netdev))