summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/sdio.c
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2009-09-11 16:00:19 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-09-23 11:35:44 -0400
commita8696c800b8154e27b359866f7b837079cdb513a (patch)
tree6407ebbe05d64a5f070faac02b3464102e572661 /drivers/net/wireless/b43/sdio.c
parentce6c4a13927bc0418169fe543c6614abfab051eb (diff)
downloadlinux-a8696c800b8154e27b359866f7b837079cdb513a.tar.bz2
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>
Diffstat (limited to 'drivers/net/wireless/b43/sdio.c')
-rw-r--r--drivers/net/wireless/b43/sdio.c5
1 files changed, 5 insertions, 0 deletions
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,