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

b43: Protect sanity check against physical device removal

Browse Source 
Fix IRQ mask sanity check for physically pulled device.

Tested-by: Andrew Price <andy@andrewprice.me.uk>
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-10-03 00:57:58 +02:00
committed by John W. Linville
parent 886e71de1f
commit 49d965c8f7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3874,6 +3874,7 @@ static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev)
{ {
struct b43_wl *wl = dev->wl; struct b43_wl *wl = dev->wl;
struct b43_wldev *orig_dev; struct b43_wldev *orig_dev;
u32 mask;
redo: redo:
if (!dev || b43_status(dev) < B43_STAT_STARTED) if (!dev || b43_status(dev) < B43_STAT_STARTED)
@@ -3920,7 +3921,8 @@ redo:
goto redo; goto redo;
return dev; return dev;
} }
B43_WARN_ON(b43_read32(dev, B43_MMIO_GEN_IRQ_MASK)); mask = b43_read32(dev, B43_MMIO_GEN_IRQ_MASK);
B43_WARN_ON(mask != 0xFFFFFFFF && mask);
/* Drain the TX queue */ /* Drain the TX queue */
while (skb_queue_len(&wl->tx_queue)) while (skb_queue_len(&wl->tx_queue))