diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-08 15:55:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-08 15:55:21 -0700 |
| commit | 67972e0c238fa802580b5919f11e1de3da5179da (patch) | |
| tree | 27022c957154a9d36fc8aa0f020bed523e7849b3 /drivers/net/wireless/b43/main.c | |
| parent | ad61df918c44316940404891d5082c63e79c256a (diff) | |
| parent | 8a8e05e5d8f6155788761961fc9845328863c16d (diff) | |
| download | kernel-crypto-67972e0c238fa802580b5919f11e1de3da5179da.tar.gz kernel-crypto-67972e0c238fa802580b5919f11e1de3da5179da.tar.xz kernel-crypto-67972e0c238fa802580b5919f11e1de3da5179da.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 9b907a36bb8..df6b26a0c05 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -3874,6 +3874,7 @@ static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev) { struct b43_wl *wl = dev->wl; struct b43_wldev *orig_dev; + u32 mask; redo: if (!dev || b43_status(dev) < B43_STAT_STARTED) @@ -3920,7 +3921,8 @@ redo: goto redo; 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 */ while (skb_queue_len(&wl->tx_queue)) @@ -4499,6 +4501,7 @@ static void b43_op_stop(struct ieee80211_hw *hw) cancel_work_sync(&(wl->beacon_update_trigger)); + wiphy_rfkill_stop_polling(hw->wiphy); mutex_lock(&wl->mutex); if (b43_status(dev) >= B43_STAT_STARTED) { dev = b43_wireless_core_stop(dev); @@ -4997,7 +5000,7 @@ static void b43_remove(struct ssb_device *dev) if (list_empty(&wl->devlist)) { b43_rng_exit(wl); - b43_leds_unregister(wldev); + b43_leds_unregister(wl); /* Last core on the chip unregistered. * We can destroy common struct b43_wl. */ |