diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-07-17 00:15:54 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-17 16:17:59 -0400 |
commit | cad1b9da74f14c5f15b63ffc93c53debe09b3781 (patch) | |
tree | 20ce24a96b34c941cc3267fe4e40b212ddb3a0e7 /drivers/net/ne2k-pci.c | |
parent | f6c4286590e7cb13dd16cb2a6e4dc4a27ce6df1d (diff) |
[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) | |||
669 | static int ne2k_pci_resume (struct pci_dev *pdev) | 669 | static int ne2k_pci_resume (struct pci_dev *pdev) |
670 | { | 670 | { |
671 | struct net_device *dev = pci_get_drvdata (pdev); | 671 | struct net_device *dev = pci_get_drvdata (pdev); |
672 | int rc; | ||
672 | 673 | ||
673 | pci_set_power_state(pdev, 0); | 674 | pci_set_power_state(pdev, 0); |
674 | pci_restore_state(pdev); | 675 | pci_restore_state(pdev); |
675 | pci_enable_device(pdev); | 676 | |
677 | rc = pci_enable_device(pdev); | ||
678 | if (rc) | ||
679 | return rc; | ||
680 | |||
676 | NS8390_init(dev, 1); | 681 | NS8390_init(dev, 1); |
677 | netif_device_attach(dev); | 682 | netif_device_attach(dev); |
678 | 683 | ||