diff --git a/[refs] b/[refs] index 9ba298fbe19c..861fea5dc0d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1bfcd97414d3e9b3c96f27d9b1a1e76c9543ba6 +refs/heads/master: 46e178535836dcd7ef92f179218628d101892c59 diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c index 5485e3b1cd35..0ee3e27969c6 100644 --- a/trunk/drivers/net/b44.c +++ b/trunk/drivers/net/b44.c @@ -2041,6 +2041,8 @@ static int b44_suspend(struct pci_dev *pdev, pm_message_t state) b44_free_rings(bp); spin_unlock_irq(&bp->lock); + + free_irq(dev->irq, dev); pci_disable_device(pdev); return 0; } @@ -2057,6 +2059,9 @@ static int b44_resume(struct pci_dev *pdev) if (!netif_running(dev)) return 0; + if (request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev)) + printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name); + spin_lock_irq(&bp->lock); b44_init_rings(bp);