---

yaml --- r: 10943 b: refs/heads/master c: 46e1785 h: refs/heads/master i: 10941: 050d002 10939: 70e82a3 10935: 00c6306 10927: d1fe9cb 10911: c45cc92 10879: 4cb1ebc v: v3
git-mirror · Oct 28, 2005 · 31ef474 · 31ef474
1 parent 8636ccd
commit 31ef474
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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);