From 2c44f2ce91ddd83b722c47d507dda2f9bcdc39bf Mon Sep 17 00:00:00 2001 From: Dmitriy Monakhov Date: Sat, 27 Jan 2007 00:00:03 -0800 Subject: [PATCH] --- yaml --- r: 45958 b: refs/heads/master c: 90afd0e574a1a739aeb62e30d556ebf0289389e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/b44.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f35b126f7b48..aeb9fd2db9aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00576e93805bd4f2dd2649e354726dee872d1e8a +refs/heads/master: 90afd0e574a1a739aeb62e30d556ebf0289389e5 diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c index 26b9295cb9b7..303a8d94ad4b 100644 --- a/trunk/drivers/net/b44.c +++ b/trunk/drivers/net/b44.c @@ -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);