diff options
| author | Fabio Baltieri <fabio.baltieri@gmail.com> | 2012-08-15 21:44:34 +0800 |
|---|---|---|
| committer | Bryan Wu <bryan.wu@canonical.com> | 2012-09-11 18:32:40 +0800 |
| commit | d23a22a74fded23a12434c9463fe66cec2b0afcd (patch) | |
| tree | 65b61353a251d780a7b5f854d1b56cb8d8ca4764 /drivers/leds/led-triggers.c | |
| parent | 490dcee9b433302da4ec5325c3e69a0be1201473 (diff) | |
| download | linux-3.10-d23a22a74fded23a12434c9463fe66cec2b0afcd.tar.gz linux-3.10-d23a22a74fded23a12434c9463fe66cec2b0afcd.tar.bz2 linux-3.10-d23a22a74fded23a12434c9463fe66cec2b0afcd.zip | |
leds: delay led_set_brightness if stopping soft-blink
Delay execution of led_set_brightness() if need to stop soft-blink
timer.
This allows led_set_brightness to be called in hard-irq context even if
soft-blink was activated on that LED.
Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Diffstat (limited to 'drivers/leds/led-triggers.c')
| -rw-r--r-- | drivers/leds/led-triggers.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index 363975b3c92..b53bf54023f 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c @@ -109,6 +109,8 @@ void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig) list_del(&led_cdev->trig_list); write_unlock_irqrestore(&led_cdev->trigger->leddev_list_lock, flags); + cancel_work_sync(&led_cdev->set_brightness_work); + led_stop_software_blink(led_cdev); if (led_cdev->trigger->deactivate) led_cdev->trigger->deactivate(led_cdev); led_cdev->trigger = NULL; @@ -224,7 +226,7 @@ void led_trigger_event(struct led_trigger *trig, struct led_classdev *led_cdev; led_cdev = list_entry(entry, struct led_classdev, trig_list); - __led_set_brightness(led_cdev, brightness); + led_set_brightness(led_cdev, brightness); } read_unlock(&trig->leddev_list_lock); } |