diff options
author | Michael Buesch <mb@bu3sch.de> | 2009-09-14 17:22:08 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-09-23 11:35:45 -0400 |
commit | e899a3f232125c393cdf7f7bf6533501ef8808fb (patch) | |
tree | bf6dae95b5e9da612ccdc24f56807c66ca310d0a /drivers/net/wireless/b43/leds.c | |
parent | 9308779aad721cab8434fd5f98d3c85d3716fdec (diff) |
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/leds.c')
-rw-r--r-- | drivers/net/wireless/b43/leds.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c index ac5a322c84b7..fbe31e02688b 100644 --- a/drivers/net/wireless/b43/leds.c +++ b/drivers/net/wireless/b43/leds.c | |||
@@ -112,10 +112,7 @@ static void b43_led_brightness_set(struct led_classdev *led_dev, | |||
112 | struct b43_led *led = container_of(led_dev, struct b43_led, led_dev); | 112 | struct b43_led *led = container_of(led_dev, struct b43_led, led_dev); |
113 | struct b43_wl *wl = led->wl; | 113 | struct b43_wl *wl = led->wl; |
114 | 114 | ||
115 | /* The check for current_dev is only needed while unregistering, | 115 | if (likely(!wl->leds.stop)) { |
116 | * so it is sequencial and does not race. But we must not dereference | ||
117 | * current_dev here. */ | ||
118 | if (likely(wl->current_dev)) { | ||
119 | atomic_set(&led->state, brightness); | 116 | atomic_set(&led->state, brightness); |
120 | ieee80211_queue_work(wl->hw, &wl->leds.work); | 117 | ieee80211_queue_work(wl->hw, &wl->leds.work); |
121 | } | 118 | } |
@@ -314,6 +311,8 @@ void b43_leds_init(struct b43_wldev *dev) | |||
314 | break; | 311 | break; |
315 | } | 312 | } |
316 | } | 313 | } |
314 | |||
315 | dev->wl->leds.stop = 0; | ||
317 | } | 316 | } |
318 | 317 | ||
319 | void b43_leds_exit(struct b43_wldev *dev) | 318 | void b43_leds_exit(struct b43_wldev *dev) |