diff options
| author | Dmitriy Monakhov <dmonakhov@sw.ru> | 2007-03-06 02:41:59 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-03-06 06:10:02 -0500 |
| commit | e12651539808437a97f3e33c659c3d7b4000e41e (patch) | |
| tree | 4e5cd7a11a8300f71aa85ec1c591f460e06e34c6 /drivers/net/3c59x.c | |
| parent | cfa51b9dbf5aa385c6d1f8645587fdc4fe8c13fd (diff) | |
| download | kernel-common-e12651539808437a97f3e33c659c3d7b4000e41e.tar.gz kernel-common-e12651539808437a97f3e33c659c3d7b4000e41e.tar.bz2 kernel-common-e12651539808437a97f3e33c659c3d7b4000e41e.zip | |
3c59x: Handle pci_enable_device() failure while resuming
Handle pci_enable_device() failure while resuming, we can safely exit here.
Signed-off-by: Monakhov Dmitriy <dmonakhov@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/3c59x.c')
| -rw-r--r-- | drivers/net/3c59x.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 716a47210aa3..72995777f809 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c @@ -822,11 +822,17 @@ static int vortex_resume(struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); struct vortex_private *vp = netdev_priv(dev); + int err; if (dev && vp) { pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); - pci_enable_device(pdev); + err = pci_enable_device(pdev); + if (err) { + printk(KERN_WARNING "%s: Could not enable device \n", + dev->name); + return err; + } pci_set_master(pdev); if (request_irq(dev->irq, vp->full_bus_master_rx ? &boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev)) { |