[netdrvr] eepro100, ne2k-pci: abort resume if pci_enable_device() fails
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
f6c4286590
commit
cad1b9da74
|
@ -2292,10 +2292,15 @@ static int eepro100_resume(struct pci_dev *pdev)
|
||||||
struct net_device *dev = pci_get_drvdata (pdev);
|
struct net_device *dev = pci_get_drvdata (pdev);
|
||||||
struct speedo_private *sp = netdev_priv(dev);
|
struct speedo_private *sp = netdev_priv(dev);
|
||||||
void __iomem *ioaddr = sp->regs;
|
void __iomem *ioaddr = sp->regs;
|
||||||
|
int rc;
|
||||||
|
|
||||||
pci_set_power_state(pdev, PCI_D0);
|
pci_set_power_state(pdev, PCI_D0);
|
||||||
pci_restore_state(pdev);
|
pci_restore_state(pdev);
|
||||||
pci_enable_device(pdev);
|
|
||||||
|
rc = pci_enable_device(pdev);
|
||||||
|
if (rc)
|
||||||
|
return rc;
|
||||||
|
|
||||||
pci_set_master(pdev);
|
pci_set_master(pdev);
|
||||||
|
|
||||||
if (!netif_running(dev))
|
if (!netif_running(dev))
|
||||||
|
|
|
@ -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)
|
static int ne2k_pci_resume (struct pci_dev *pdev)
|
||||||
{
|
{
|
||||||
struct net_device *dev = pci_get_drvdata (pdev);
|
struct net_device *dev = pci_get_drvdata (pdev);
|
||||||
|
int rc;
|
||||||
|
|
||||||
pci_set_power_state(pdev, 0);
|
pci_set_power_state(pdev, 0);
|
||||||
pci_restore_state(pdev);
|
pci_restore_state(pdev);
|
||||||
pci_enable_device(pdev);
|
|
||||||
|
rc = pci_enable_device(pdev);
|
||||||
|
if (rc)
|
||||||
|
return rc;
|
||||||
|
|
||||||
NS8390_init(dev, 1);
|
NS8390_init(dev, 1);
|
||||||
netif_device_attach(dev);
|
netif_device_attach(dev);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue