From d69f81ddfd7905a291e141d7a1f2b97c316eb425 Mon Sep 17 00:00:00 2001
From: James Hogan <james@albanarts.com>
Date: Sun, 17 Oct 2010 01:48:59 +0000
Subject: [PATCH] --- yaml --- r: 215432 b: refs/heads/master c:
 afed4ccb0d975f1d3c98880ecf19a24f3d842394 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/net/b44.c | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index aebada99ee2a..4c5123a1560f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31b9c19bfe32bed7fdf80cd0b1aa9d0f0569844a
+refs/heads/master: afed4ccb0d975f1d3c98880ecf19a24f3d842394
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
index 8e7c8a8e61c7..171da7f75108 100644
--- a/trunk/drivers/net/b44.c
+++ b/trunk/drivers/net/b44.c
@@ -2296,18 +2296,27 @@ static int b44_resume(struct ssb_device *sdev)
 	if (!netif_running(dev))
 		return 0;
 
+	spin_lock_irq(&bp->lock);
+	b44_init_rings(bp);
+	b44_init_hw(bp, B44_FULL_RESET);
+	spin_unlock_irq(&bp->lock);
+
+	/*
+	 * As a shared interrupt, the handler can be called immediately. To be
+	 * able to check the interrupt status the hardware must already be
+	 * powered back on (b44_init_hw).
+	 */
 	rc = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev);
 	if (rc) {
 		netdev_err(dev, "request_irq failed\n");
+		spin_lock_irq(&bp->lock);
+		b44_halt(bp);
+		b44_free_rings(bp);
+		spin_unlock_irq(&bp->lock);
 		return rc;
 	}
 
-	spin_lock_irq(&bp->lock);
-
-	b44_init_rings(bp);
-	b44_init_hw(bp, B44_FULL_RESET);
 	netif_device_attach(bp->dev);
-	spin_unlock_irq(&bp->lock);
 
 	b44_enable_ints(bp);
 	netif_wake_queue(dev);