led: core: Fix brightness setting when setting delay_off=0

Matthieu CASTET · jacek-anaszewski · commit 2b83ff96f51d · 2017-12-27T20:45:07.000+01:00
With the current code, the following sequence won't work :
echo timer &gt; trigger

echo 0 &gt;  delay_off
* at this point we call
** led_delay_off_store
** led_blink_set
*** stop timer
** led_blink_setup
** led_set_software_blink
*** if !delay_on, led off
*** if !delay_off, set led_set_brightness_nosleep &lt;--- LED_BLINK_SW is set but timer is stop
*** otherwise start timer/set LED_BLINK_SW flag

echo xxx &gt; brightness
* led_set_brightness
** if LED_BLINK_SW
*** if brightness=0, led off
*** else apply brightness if next timer &lt;--- timer is stop, and will never apply new setting
** otherwise set led_set_brightness_nosleep

To fix that, when we delete the timer, we should clear LED_BLINK_SW.

Cc: linux-leds@vger.kernel.org
Signed-off-by: Matthieu CASTET &lt;matthieu.castet@parrot.com&gt;
Signed-off-by: Jacek Anaszewski &lt;jacek.anaszewski@gmail.com&gt;
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
@@ -186,7 +186,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);

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ void led_blink_set(struct led_classdev *led_cdev,`
`186`	`186`	`unsigned long *delay_on,`
`187`	`187`	`unsigned long *delay_off)`
`188`	`188`	`{`
`189`		`- del_timer_sync(&led_cdev->blink_timer);`
	`189`	`+ led_stop_software_blink(led_cdev);`
`190`	`190`
`191`	`191`	`clear_bit(LED_BLINK_ONESHOT, &led_cdev->work_flags);`
`192`	`192`	`clear_bit(LED_BLINK_ONESHOT_STOP, &led_cdev->work_flags);`