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

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

Broadcom 4400 resume small fix 



Some issues in b44_resume().

- Return value of pci_enable_device() was ignored.

- If request_irq() has failed we have to just disable device and exit.

Signed-off-by: default avatarDmitriy Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 00576e93

drivers/net/b44.c

+13 −2
Original line number Diff line number Diff line
@@ -2320,16 +2320,27 @@ static int b44_resume(struct pci_dev *pdev) 
{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct b44 *bp = netdev_priv(dev);

	int rc = 0;



	pci_restore_state(pdev);

	pci_enable_device(pdev);

	rc = pci_enable_device(pdev);

	if (rc) {

		printk(KERN_ERR PFX "%s: pci_enable_device failed\n",

			dev->name);

		return rc;

	}



	pci_set_master(pdev);



	if (!netif_running(dev))

		return 0;



	if (request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev))

	rc = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev);

	if (rc) {

		printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);

		pci_disable_device(pdev);

		return rc;

	}



	spin_lock_irq(&bp->lock);