diff options
| author | Ben Hutchings <ben.hutchings@codethink.co.uk> | 2018-03-08 15:59:07 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-08 11:49:44 +0200 |
| commit | 15075ddaadee365837c7ae5d00299e6890b8289b (patch) | |
| tree | 49899a2e329c306660d28f3259ccf26706910796 | |
| parent | 7d14bc73d4d93db22b27493a405996857fb0748f (diff) | |
| download | linux-15075ddaadee365837c7ae5d00299e6890b8289b.tar.gz linux-15075ddaadee365837c7ae5d00299e6890b8289b.tar.bz2 linux-15075ddaadee365837c7ae5d00299e6890b8289b.zip | |
Revert "led: core: Fix brightness setting when setting delay_off=0"
This reverts commit 20f6d9c2af33da892a0e03ffd6249c7ab81edfb7, which
was commit 2b83ff96f51d0b039c4561b9f95c824d7bddb85c upstream.
The bug that it should fix was only introduced in Linux 4.7, and
in 4.4 it causes a regression.
Reported-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Cc: Matthieu CASTET <matthieu.castet@parrot.com>
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Cc: Wang Han <wanghan1995315@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 0633cf033645..aaa8eba9099f 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) { - led_stop_software_blink(led_cdev); + del_timer_sync(&led_cdev->blink_timer); led_cdev->flags &= ~LED_BLINK_ONESHOT; led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP; |