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-03-11 16:19:45 +0100 |
| commit | 3f3437fbb2d8f780e84f507282d03facb4ccf248 (patch) | |
| tree | b0c9143d43e55c2f82a8426bfd20625338ee2c2c /drivers/leds | |
| parent | c2da3bb9cfab37eae4ad92d53f8e7a86d5747dd5 (diff) | |
| download | linux-stable-3f3437fbb2d8f780e84f507282d03facb4ccf248.tar.gz linux-stable-3f3437fbb2d8f780e84f507282d03facb4ccf248.tar.bz2 linux-stable-3f3437fbb2d8f780e84f507282d03facb4ccf248.zip | |
Revert "led: core: Fix brightness setting when setting delay_off=0"
This reverts commit 20ac8f72514b3af8b62c520d55656ded865eff00, 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/leds')
| -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 92b6798ef5b3..c1c3af089634 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) { - 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; |