diff options
| author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2006-02-07 07:50:45 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 07:50:45 +0100 |
| commit | 471ef051bc3b980e2f38cbe9112eac7bfe4d6633 (patch) | |
| tree | 05f8ab666ba3c3ff7964b8a6551707977ada9177 /drivers/net/e100.c | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| download | linux-471ef051bc3b980e2f38cbe9112eac7bfe4d6633.tar.xz linux-471ef051bc3b980e2f38cbe9112eac7bfe4d6633.zip | |
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/e100.c')
| -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) 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)) |