lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

b43: Fix SDIO interrupt handler deadlock

Browse Source 
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>
This commit is contained in:
Michael Buesch
2009-09-11 16:00:19 +02:00
committed by John W. Linville
parent ce6c4a1392
commit a8696c800b
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/b43/main.c
View File

@@ -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) static void b43_sdio_interrupt_handler(struct b43_wldev *dev)
{ {
struct b43_wl *wl = dev->wl; struct b43_wl *wl = dev->wl;
struct sdio_func *func = dev->dev->bus->host_sdio;
irqreturn_t ret; irqreturn_t ret;
if (unlikely(b43_status(dev) < B43_STAT_STARTED))
return;
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
sdio_release_host(func);
ret = b43_do_interrupt(dev); ret = b43_do_interrupt(dev);
if (ret == IRQ_WAKE_THREAD) if (ret == IRQ_WAKE_THREAD)
b43_do_interrupt_thread(dev); b43_do_interrupt_thread(dev);
sdio_claim_host(func);
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);
} }

5
drivers/net/wireless/b43/sdio.c
View File

@@ -54,7 +54,12 @@ static void b43_sdio_interrupt_dispatcher(struct sdio_func *func)
struct b43_sdio *sdio = sdio_get_drvdata(func); struct b43_sdio *sdio = sdio_get_drvdata(func);
struct b43_wldev *dev = sdio->irq_handler_opaque; 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->irq_handler(dev);
sdio_claim_host(func);
} }
int b43_sdio_request_irq(struct b43_wldev *dev, int b43_sdio_request_irq(struct b43_wldev *dev,