diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2006-02-07 01:50:45 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:50:45 -0500 |
commit | 471ef051bc3b980e2f38cbe9112eac7bfe4d6633 (patch) | |
tree | 05f8ab666ba3c3ff7964b8a6551707977ada9177 /drivers/net | |
parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (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.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index bf1fd2b98bf8..24253c807e55 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -2752,8 +2752,6 @@ static int e100_resume(struct pci_dev *pdev) | |||
2752 | retval = pci_enable_wake(pdev, 0, 0); | 2752 | retval = pci_enable_wake(pdev, 0, 0); |
2753 | if (retval) | 2753 | if (retval) |
2754 | DPRINTK(PROBE,ERR, "Error clearing wake events\n"); | 2754 | DPRINTK(PROBE,ERR, "Error clearing wake events\n"); |
2755 | if(e100_hw_init(nic)) | ||
2756 | DPRINTK(HW, ERR, "e100_hw_init failed\n"); | ||
2757 | 2755 | ||
2758 | netif_device_attach(netdev); | 2756 | netif_device_attach(netdev); |
2759 | if(netif_running(netdev)) | 2757 | if(netif_running(netdev)) |