On Sat 2018-02-03 18:00:59, Sasha Levin wrote:
> From: Matthieu CASTET <matthieu.castet@xxxxxxxxxx>
>
> [ 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
> *** stop timer
> ** led_blink_setup
> ** led_set_software_blink
> *** if !delay_on, led off
> *** if !delay_off, set led_set_brightness_nosleep <--- LED_BLINK_SW is set but timer is stop
> *** otherwise start timer/set LED_BLINK_SW flag
>
> echo xxx > brightness
> * led_set_brightness
> ** if LED_BLINK_SW
> *** if brightness=0, led off
> *** else apply brightness if next timer <--- 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.
Can you run the tests on the affected stable kernels? I have feeling
that the problem described might not be present there.
Thanks,
Pavel
> Cc: linux-leds@xxxxxxxxxxxxxxx
> Signed-off-by: Matthieu CASTET <matthieu.castet@xxxxxxxxxx>
> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@xxxxxxxxx>
> Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxxxx>
> ---
> drivers/leds/led-core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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);
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Attachment:
signature.asc
Description: Digital signature