diff options
-rw-r--r-- | drivers/net/eepro100.c | 7 | ||||
-rw-r--r-- | drivers/net/ne2k-pci.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 9afa47edfc58..3c54014acece 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c | |||
@@ -2292,10 +2292,15 @@ static int eepro100_resume(struct pci_dev *pdev) | |||
2292 | struct net_device *dev = pci_get_drvdata (pdev); | 2292 | struct net_device *dev = pci_get_drvdata (pdev); |
2293 | struct speedo_private *sp = netdev_priv(dev); | 2293 | struct speedo_private *sp = netdev_priv(dev); |
2294 | void __iomem *ioaddr = sp->regs; | 2294 | void __iomem *ioaddr = sp->regs; |
2295 | int rc; | ||
2295 | 2296 | ||
2296 | pci_set_power_state(pdev, PCI_D0); | 2297 | pci_set_power_state(pdev, PCI_D0); |
2297 | pci_restore_state(pdev); | 2298 | pci_restore_state(pdev); |
2298 | pci_enable_device(pdev); | 2299 | |
2300 | rc = pci_enable_device(pdev); | ||
2301 | if (rc) | ||
2302 | return rc; | ||
2303 | |||
2299 | pci_set_master(pdev); | 2304 | pci_set_master(pdev); |
2300 | 2305 | ||
2301 | if (!netif_running(dev)) | 2306 | if (!netif_running(dev)) |
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 | ||