From: Matthieu CASTET <matthieu.castet@parrot.com>
Date: Tue, 12 Dec 2017 10:10:44 +0000 (+0100)
Subject: led: core: Fix brightness setting when setting delay_off=0
X-Git-Tag: v4.4.120~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20ac8f72514b3af8b62c520d55656ded865eff00;p=thirdparty%2Fkernel%2Fstable.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 c1c3af089634c..92b6798ef5b38 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -149,7 +149,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);
 
 	led_cdev->flags &= ~LED_BLINK_ONESHOT;
 	led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;