Commit 471ef051 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Garzik

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: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent c03296a8
...@@ -2752,8 +2752,6 @@ static int e100_resume(struct pci_dev *pdev) ...@@ -2752,8 +2752,6 @@ static int e100_resume(struct pci_dev *pdev)
retval = pci_enable_wake(pdev, 0, 0); retval = pci_enable_wake(pdev, 0, 0);
if (retval) if (retval)
DPRINTK(PROBE,ERR, "Error clearing wake events\n"); 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); netif_device_attach(netdev);
if(netif_running(netdev)) if(netif_running(netdev))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment