diff options
author | Matthieu CASTET <matthieu.castet@parrot.com> | 2017-12-12 13:10:44 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-03 12:17:09 +0300 |
commit | 20f6d9c2af33da892a0e03ffd6249c7ab81edfb7 (patch) | |
tree | 4d895c410c5d1aa74ba38f19948e8c46fb2114b8 | |
parent | c85a6e7bdea9a9532c1e68c1c472082bf88bc210 (diff) | |
download | linux-20f6d9c2af33da892a0e03ffd6249c7ab81edfb7.tar.xz |
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
-rw-r--r-- | drivers/leds/led-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); led_cdev->flags &= ~LED_BLINK_ONESHOT; led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP; |