Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / drivers / net / b44.c

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 5485e3b1cd353c8ec76e72bec3923af6caec1de9..0ee3e27969c6f921ad3dbfe990c48d62572996e9 100644 (file)
--- a/drivers/net/b44.c
+++ b/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);