This reverts commit 86b9fa2190907f4f550d9d6bf490c5f89ca33836.
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@xxxxxxxxxxxxx>
Reported-by: Matthias Schiffer <mschiffer@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@xxxxxxxxx>
---
drivers/leds/led-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index d70d4a5..3bce448 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;
--
2.1.4