summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/main.c
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2009-09-14 23:22:08 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-09-23 17:35:45 +0200
commite899a3f232125c393cdf7f7bf6533501ef8808fb (patch)
treebf6dae95b5e9da612ccdc24f56807c66ca310d0a /drivers/net/wireless/b43/main.c
parentb43: Add LP PHY Analog Switch Support (diff)
downloadlinux-e899a3f232125c393cdf7f7bf6533501ef8808fb.tar.xz
linux-e899a3f232125c393cdf7f7bf6533501ef8808fb.zip
b43: Don't abuse wl->current_dev in the led work
Don't abuse wl->current_dev in the LED work for checking whether we're going down. Add an explicit variable. This fixes a crash on rmmod dereferencing the wl->current_dev NULL pointer in various other places of the driver. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r--drivers/net/wireless/b43/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 7fa947ca7c32..a8840ef63770 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4987,7 +4987,7 @@ static void b43_remove(struct ssb_device *dev)
* might have modified it. Restoring is important, so the networking
* stack can properly free resources. */
wl->hw->queues = wl->mac80211_initially_registered_queues;
- wl->current_dev = NULL;
+ wl->leds.stop = 1;
cancel_work_sync(&wl->leds.work);
ieee80211_unregister_hw(wl->hw);
}