[PATCH 3.18 47/93] Revert "led: core: Fix brightness setting when setting delay_off=0"
3.18-stable review patch. If anyone has any objections, please let me know. -- From: Ben HutchingsThis reverts commit 20f6d9c2af33da892a0e03ffd6249c7ab81edfb7, which was commit 2b83ff96f51d0b039c4561b9f95c824d7bddb85c upstream. The bug that it should fix was only introduced in Linux 4.7, and in 4.4 it causes a regression. Reported-by: Jacek Anaszewski Cc: Matthieu CASTET Signed-off-by: Ben Hutchings Cc: Wang Han Signed-off-by: Greg Kroah-Hartman --- drivers/leds/led-core.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -76,7 +76,7 @@ void led_blink_set(struct led_classdev * unsigned long *delay_on, unsigned long *delay_off) { - led_stop_software_blink(led_cdev); + del_timer_sync(_cdev->blink_timer); led_cdev->flags &= ~LED_BLINK_ONESHOT; led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;
[PATCH 3.18 47/93] Revert "led: core: Fix brightness setting when setting delay_off=0"
3.18-stable review patch. If anyone has any objections, please let me know. -- From: Ben Hutchings This reverts commit 20f6d9c2af33da892a0e03ffd6249c7ab81edfb7, which was commit 2b83ff96f51d0b039c4561b9f95c824d7bddb85c upstream. The bug that it should fix was only introduced in Linux 4.7, and in 4.4 it causes a regression. Reported-by: Jacek Anaszewski Cc: Matthieu CASTET Signed-off-by: Ben Hutchings Cc: Wang Han Signed-off-by: Greg Kroah-Hartman --- drivers/leds/led-core.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -76,7 +76,7 @@ void led_blink_set(struct led_classdev * unsigned long *delay_on, unsigned long *delay_off) { - led_stop_software_blink(led_cdev); + del_timer_sync(_cdev->blink_timer); led_cdev->flags &= ~LED_BLINK_ONESHOT; led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;