summaryrefslogtreecommitdiff
path: root/drivers/leds/led-core.c
diff options
context:
space:
mode:
authorJacek Anaszewski <jacek.anaszewski@gmail.com>2018-03-19 20:23:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-24 11:00:08 +0100
commit2d07d7d7032c340564d84cedfba60a4d53355e95 (patch)
tree75f8bf57e9e27abe8c22e0cac1724ce13f486643 /drivers/leds/led-core.c
parentd3c79a38843b7d44734dacc17694a72a0b269b74 (diff)
Revert "led: core: Fix brightness setting when setting delay_off=0"
This reverts commit 86b9fa2190907f4f550d9d6bf490c5f89ca33836 which was commit 2b83ff96f51d0b039c4561b9f95c824d7bddb85c upstream. The commit being reverted has two flaws: - it introduces a regression, fixed in the upstream commit 7b6af2c53192f1766892ef40c8f48a413509ed72. - it has truncated commit message Reported-by: Sasha Levin <Alexander.Levin@microsoft.com> Reported-by: Matthias Schiffer <mschiffer@universe-factory.net> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/leds/led-core.c')
-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 d70d4a5273b8..3bce44893021 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)
{
- 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;