X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Feepro100.c;h=3c54014acece68be4c3217a5565ec2f47eafd7f9;hb=5f08e46b621a769e52a9545a23ab1d5fb2aec1d4;hp=9afa47edfc5850e65309530f68e8dbab2f437656;hpb=21ba0f88ae56da82a3a15fe54d729208b64c4f4b;p=linux-2.6 diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 9afa47edfc..3c54014ace 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -2292,10 +2292,15 @@ static int eepro100_resume(struct pci_dev *pdev) struct net_device *dev = pci_get_drvdata (pdev); struct speedo_private *sp = netdev_priv(dev); void __iomem *ioaddr = sp->regs; + int rc; pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); - pci_enable_device(pdev); + + rc = pci_enable_device(pdev); + if (rc) + return rc; + pci_set_master(pdev); if (!netif_running(dev))