From: Dmitriy Monakhov <dmonakhov@sw.ru>
Date: Tue, 6 Mar 2007 10:41:59 +0000 (-0800)
Subject: 3c59x: Handle pci_enable_device() failure while resuming
X-Git-Tag: v2.6.21-rc3~23^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e12651539808437a97f3e33c659c3d7b4000e41e;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 716a47210aa..72995777f80 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)) {