---

yaml --- r: 166273 b: refs/heads/master c: 176e9f6 h: refs/heads/master i: 166271: 06fccff v: v3
git-mirror · Sep 23, 2009 · 9fe39f7 · 9fe39f7
1 parent 2fc509b
commit 9fe39f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8696c800b8154e27b359866f7b837079cdb513a
+refs/heads/master: 176e9f6a4cf4b1bf66d18243ede0938a35c81541
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
@@ -3854,10 +3854,15 @@ static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev)
 		b43_read32(dev, B43_MMIO_GEN_IRQ_MASK);	/* Flush */
 		spin_unlock_irq(&wl->hardirq_lock);
 	}
-	/* Synchronize the interrupt handlers. Unlock to avoid deadlocks. */
+	/* Synchronize and free the interrupt handlers. Unlock to avoid deadlocks. */
 	orig_dev = dev;
 	mutex_unlock(&wl->mutex);
-	synchronize_irq(dev->dev->irq);
+	if (dev->dev->bus->bustype == SSB_BUSTYPE_SDIO) {
+		b43_sdio_free_irq(dev);
+	} else {
+		synchronize_irq(dev->dev->irq);
+		free_irq(dev->dev->irq, dev);
+	}
 	mutex_lock(&wl->mutex);
 	dev = wl->current_dev;
 	if (!dev)
@@ -3874,10 +3879,6 @@ static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev)
 		dev_kfree_skb(skb_dequeue(&wl->tx_queue));
 
 	b43_mac_suspend(dev);
-	if (dev->dev->bus->bustype == SSB_BUSTYPE_SDIO)
-		b43_sdio_free_irq(dev);
-	else
-		free_irq(dev->dev->irq, dev);
 	b43_leds_exit(dev);
 	b43dbg(wl, "Wireless interface stopped\n");