From: Matthieu CASTET Date: Tue, 12 Dec 2017 10:10:44 +0000 (+0100) Subject: led: core: Fix brightness setting when setting delay_off=0 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c2acc885913807ce4f6d21353d4d7525eaeb2c01;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 --- 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);