From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL for 3.18 11/24] led: core: Fix brightness setting when setting delay_off=0 Date: Sat, 3 Feb 2018 18:05:04 +0000 Message-ID: <20180203180444.10801-11-alexander.levin@microsoft.com> References: <20180203180444.10801-1-alexander.levin@microsoft.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20180203180444.10801-1-alexander.levin@microsoft.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Cc: Matthieu CASTET , "linux-leds@vger.kernel.org" , Jacek Anaszewski , Sasha Levin List-Id: linux-leds@vger.kernel.org From: Matthieu CASTET [ 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=3D0, 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. Cc: linux-leds@vger.kernel.org Signed-off-by: Matthieu CASTET Signed-off-by: Jacek Anaszewski Signed-off-by: Sasha Levin --- 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 aaa8eba9099f..0633cf033645 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -76,7 +76,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); =20 led_cdev->flags &=3D ~LED_BLINK_ONESHOT; led_cdev->flags &=3D ~LED_BLINK_ONESHOT_STOP; --=20 2.11.0