Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8696c80 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

b43: Fix SDIO interrupt handler deadlock 



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

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ce6c4a13

drivers/net/wireless/b43/main.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

}

drivers/net/wireless/b43/sdio.c

+5 −0
Original line number Diff line number Diff line
@@ -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,