b43: Fix SDIO interrupt handler deadlock

We need to release the SDIO host before locking the driver mutex.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 5 insertions, 6 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 950a838757c4..5b0aeff01dbf 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1914,20 +1914,14 @@ static irqreturn_t b43_interrupt_handler(int irq, void *dev_id)
 static void b43_sdio_interrupt_handler(struct b43_wldev *dev)
 {
         struct b43_wl *wl = dev->wl;
-        struct sdio_func *func = dev->dev->bus->host_sdio;
         irqreturn_t ret;
 
-        if (unlikely(b43_status(dev) < B43_STAT_STARTED))
-                return;
-
         mutex_lock(&wl->mutex);
-        sdio_release_host(func);
 
         ret = b43_do_interrupt(dev);
         if (ret == IRQ_WAKE_THREAD)
                 b43_do_interrupt_thread(dev);
 
-        sdio_claim_host(func);
         mutex_unlock(&wl->mutex);
 }
 
diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/b43/sdio.c
index 2d337f1a60b2..0d3ac64147a5 100644
--- a/drivers/net/wireless/b43/sdio.c
+++ b/drivers/net/wireless/b43/sdio.c
@@ -54,7 +54,12 @@ static void b43_sdio_interrupt_dispatcher(struct sdio_func *func)
         struct b43_sdio *sdio = sdio_get_drvdata(func);
         struct b43_wldev *dev = sdio->irq_handler_opaque;
 
+        if (unlikely(b43_status(dev) < B43_STAT_STARTED))
+                return;
+
+        sdio_release_host(func);
         sdio->irq_handler(dev);
+        sdio_claim_host(func);
 }
 
 int b43_sdio_request_irq(struct b43_wldev *dev,