]> err.no Git - linux-2.6/commitdiff
e100: remove init_hw call to fix panic
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Tue, 7 Feb 2006 06:50:45 +0000 (01:50 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 06:50:45 +0000 (01:50 -0500)
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>
drivers/net/e100.c

index bf1fd2b98bf897f5ea252caaa5856c25908ccc42..24253c807e555ec89d735d9dab12ccfb5344a9d1 100644 (file)
@@ -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))