diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-07-17 06:15:54 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-07-17 22:17:59 +0200 |
| commit | cad1b9da74f14c5f15b63ffc93c53debe09b3781 (patch) | |
| tree | 20ce24a96b34c941cc3267fe4e40b212ddb3a0e7 /drivers/net/ne2k-pci.c | |
| parent | [netdrvr] natsemi: Fix device removal bug (diff) | |
| download | linux-cad1b9da74f14c5f15b63ffc93c53debe09b3781.tar.xz linux-cad1b9da74f14c5f15b63ffc93c53debe09b3781.zip | |
[netdrvr] eepro100, ne2k-pci: abort resume if pci_enable_device() fails
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ne2k-pci.c')
| -rw-r--r-- | drivers/net/ne2k-pci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index 995c0a5d4066..cfdeaf7aa163 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c @@ -669,10 +669,15 @@ static int ne2k_pci_suspend (struct pci_dev *pdev, pm_message_t state) static int ne2k_pci_resume (struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata (pdev); + int rc; pci_set_power_state(pdev, 0); pci_restore_state(pdev); - pci_enable_device(pdev); + + rc = pci_enable_device(pdev); + if (rc) + return rc; + NS8390_init(dev, 1); netif_device_attach(dev); |