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

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

b43: Fix IRQ sync for SDIO 



synchronize_irq is meaningless for SDIO. sdio_release_irq will
sync the IRQ thread for us.

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

drivers/net/wireless/b43/main.c

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

	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");