Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1265153 authored by Dmitriy Monakhov's avatar Dmitriy Monakhov Committed by Jeff Garzik
Browse files

3c59x: Handle pci_enable_device() failure while resuming 



Handle pci_enable_device() failure while resuming, we can safely exit here.

Signed-off-by: default avatarMonakhov Dmitriy <dmonakhov@openvz.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent cfa51b9d

drivers/net/3c59x.c

+7 −1
Original line number Diff line number Diff line
@@ -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)) {