summaryrefslogtreecommitdiff
path: root/drivers/leds
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:19:43 +0100
commit20ac8f72514b3af8b62c520d55656ded865eff00 (patch)
treef135a5b4781f64b68eb0a7dc5c12769db5cb594a /drivers/leds
parenta4bd8a5a0c27b22b77076d6699b8fd9a4ddcea92 (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/leds')
-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 c1c3af089634..92b6798ef5b3 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;