led: core: Fix brightness setting when setting delay_off=0
authorMatthieu CASTET <matthieu.castet@parrot.com>
Tue, 12 Dec 2017 10:10:44 +0000 (11:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Mar 2018 09:24:31 +0000 (10:24 +0100)
[ 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

drivers/leds/led-core.c

index ef13604454133e4d3c5acb7ab2bb3c492cec490c..af630c11c284e00f409c9b3db87530ff0712b721 100644 (file)
@@ -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);