summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMatthieu CASTET <matthieu.castet@parrot.com>2017-12-12 11:10:44 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-03 10:23:24 +0100
commit86b9fa2190907f4f550d9d6bf490c5f89ca33836 (patch)
treee4b8462f873c96937fd1f722f5df49df3bbb7a56 /drivers
parentaf60c3822a721f9c2bf511ed1234e59ee4135010 (diff)
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/leds/led-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 3bce44893021..d70d4a5273b8 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -186,7 +186,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;