From 31ef4742488a194a83c40ccfab28567ee5071d01 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Fri, 28 Oct 2005 15:14:47 -0700
Subject: [PATCH] --- yaml --- r: 10943 b: refs/heads/master c:
 46e178535836dcd7ef92f179218628d101892c59 h: refs/heads/master i:   10941:
 050d002e67272556d91b6545a0ce1394fe80cf02   10939:
 70e82a3110245f661cbb62c039c5ed0f6aeb5d52   10935:
 00c6306e9aad8b5df654312c8a33f06581743943   10927:
 d1fe9cb8ee34bac517f9178fba790646f618c57c   10911:
 c45cc92eb3953d37432baf58d54c8aa4957de546   10879:
 4cb1ebce28333dcf627abc49003b4a36071ba54f v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/b44.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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);