asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ar9170: cancel led worker properly on exit

Browse source 
"[PATCH 3/4 v2] ar9170: fix LED power state handling" revealed
a bug which can cause a ugly crash.

The delayed worker is canceled before the LED class functions are
unregistered... So, if something manages to update the LEDs
while unregister routine is running the timer could fire _after_ the
module has been unloaded.

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Christian Lamparter 2009-06-01 22:49:25 +02:00 committed by John W. Linville
parent 66d008139c
commit 6d7db193f2
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/wireless/ath/ar9170/led.c
View file

@ -74,7 +74,7 @@ static void ar9170_update_leds(struct work_struct *work)
mutex_lock(&ar->mutex); mutex_lock(&ar->mutex);
for (i = 0; i < AR9170_NUM_LEDS; i++) for (i = 0; i < AR9170_NUM_LEDS; i++)
if (ar->leds[i].toggled) { if (ar->leds[i].registered && ar->leds[i].toggled) {
led_val |= 1 << i; led_val |= 1 << i;
tmp = 70 + 200 / (ar->leds[i].toggled); tmp = 70 + 200 / (ar->leds[i].toggled);
@ -101,6 +101,9 @@ static void ar9170_led_brightness_set(struct led_classdev *led,
struct ar9170_led *arl = container_of(led, struct ar9170_led, l); struct ar9170_led *arl = container_of(led, struct ar9170_led, l);
struct ar9170 *ar = arl->ar; struct ar9170 *ar = arl->ar;
if (unlikely(!arl->registered))
return ;
if (arl->last_state != !!brightness) { if (arl->last_state != !!brightness) {
arl->toggled++; arl->toggled++;
arl->last_state = !!brightness; arl->last_state = !!brightness;
@ -139,13 +142,14 @@ void ar9170_unregister_leds(struct ar9170 *ar)
{ {
int i; int i;
cancel_delayed_work_sync(&ar->led_work);
for (i = 0; i < AR9170_NUM_LEDS; i++) for (i = 0; i < AR9170_NUM_LEDS; i++)
if (ar->leds[i].registered) { if (ar->leds[i].registered) {
led_classdev_unregister(&ar->leds[i].l); led_classdev_unregister(&ar->leds[i].l);
ar->leds[i].registered = false; ar->leds[i].registered = false;
ar->leds[i].toggled = 0;
} }
cancel_delayed_work_sync(&ar->led_work);
} }
int ar9170_register_leds(struct ar9170 *ar) int ar9170_register_leds(struct ar9170 *ar)