UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch 2009-09-11 23:04:04 +02:00 committed by John W. Linville
parent a8696c800b
commit 176e9f6a4c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3854,10 +3854,15 @@ redo:
b43_read32(dev, B43_MMIO_GEN_IRQ_MASK); /* Flush */ b43_read32(dev, B43_MMIO_GEN_IRQ_MASK); /* Flush */
spin_unlock_irq(&wl->hardirq_lock); 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; orig_dev = dev;
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);
synchronize_irq(dev->dev->irq); 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); mutex_lock(&wl->mutex);
dev = wl->current_dev; dev = wl->current_dev;
if (!dev) if (!dev)
@ -3874,10 +3879,6 @@ redo:
dev_kfree_skb(skb_dequeue(&wl->tx_queue)); dev_kfree_skb(skb_dequeue(&wl->tx_queue));
b43_mac_suspend(dev); 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); b43_leds_exit(dev);
b43dbg(wl, "Wireless interface stopped\n"); b43dbg(wl, "Wireless interface stopped\n");