Pārlūkot izejas kodu

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>
Dmitriy Monakhov 18 gadi atpakaļ
vecāks
revīzija
e126515398
1 mainītis faili ar 7 papildinājumiem un 1 dzēšanām
  1. 7 1
      drivers/net/3c59x.c

+ 7 - 1
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 net_device *dev = pci_get_drvdata(pdev);
 	struct vortex_private *vp = netdev_priv(dev);
 	struct vortex_private *vp = netdev_priv(dev);
+	int err;
 
 
 	if (dev && vp) {
 	if (dev && vp) {
 		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);
+		err = pci_enable_device(pdev);
+		if (err) {
+			printk(KERN_WARNING "%s: Could not enable device \n",
+				dev->name);
+			return err;
+		}
 		pci_set_master(pdev);
 		pci_set_master(pdev);
 		if (request_irq(dev->irq, vp->full_bus_master_rx ?
 		if (request_irq(dev->irq, vp->full_bus_master_rx ?
 				&boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev)) {
 				&boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev)) {