From: Jesse Brandeburg 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 Cc: Olaf Kirch Signed-off-by: Andrew Morton --- drivers/net/e100.c | 2 -- 1 files changed, 2 deletions(-) diff -puN drivers/net/e100.c~e100-remove-init_hw-call-to-fix-panic drivers/net/e100.c --- 25/drivers/net/e100.c~e100-remove-init_hw-call-to-fix-panic Tue Jan 31 13:42:45 2006 +++ 25-akpm/drivers/net/e100.c Tue Jan 31 13:42:45 2006 @@ -2698,8 +2698,6 @@ static int e100_resume(struct pci_dev *p 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)) _