summaryrefslogtreecommitdiff
path: root/drivers/leds
diff options
context:
space:
mode:
authorMatthieu CASTET <matthieu.castet@parrot.com>2017-12-12 13:10:44 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-03 12:24:31 +0300
commitc2acc885913807ce4f6d21353d4d7525eaeb2c01 (patch)
tree2082fc4ca218c524ffb665211fe60094aeb766f1 /drivers/leds
parent6b800ce9ee8452abfbbfe66bf9cdd13f4655e9a3 (diff)
downloadlinux-c2acc885913807ce4f6d21353d4d7525eaeb2c01.tar.xz
led: core: Fix brightness setting when setting delay_off=0
[ Upstream commit 2b83ff96f51d0b039c4561b9f95c824d7bddb85c ] With the current code, the following sequence won't work : echo timer > trigger echo 0 > delay_off * at this point we call ** led_delay_off_store ** led_blink_set
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/led-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index ef1360445413..af630c11c284 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -187,7 +187,7 @@ void led_blink_set(struct led_classdev *led_cdev,
unsigned long *delay_on,
unsigned long *delay_off)
{
- del_timer_sync(&led_cdev->blink_timer);
+ led_stop_software_blink(led_cdev);
clear_bit(LED_BLINK_ONESHOT, &led_cdev->work_flags);
clear_bit(LED_BLINK_ONESHOT_STOP, &led_cdev->work_flags);