Commit cb871513 authored by Johan Hovold's avatar Johan Hovold Committed by Linus Torvalds

Revert "leds: save the delay values after a successful call to blink_set()"

Revert commit 6123b0e2.

The problem this patch intends to solve has alreadqy been fixed by
commit 7a5caabd ("drivers/leds/ledtrig-timer.c: fix broken sysfs
delay handling").
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Cc: Antonio Ospite <ospite@studenti.unina.it>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9f35a33b
...@@ -270,11 +270,8 @@ void led_blink_set(struct led_classdev *led_cdev, ...@@ -270,11 +270,8 @@ void led_blink_set(struct led_classdev *led_cdev,
del_timer_sync(&led_cdev->blink_timer); del_timer_sync(&led_cdev->blink_timer);
if (led_cdev->blink_set && if (led_cdev->blink_set &&
!led_cdev->blink_set(led_cdev, delay_on, delay_off)) { !led_cdev->blink_set(led_cdev, delay_on, delay_off))
led_cdev->blink_delay_on = *delay_on;
led_cdev->blink_delay_off = *delay_off;
return; return;
}
/* blink with 1 Hz as default if nothing specified */ /* blink with 1 Hz as default if nothing specified */
if (!*delay_on && !*delay_off) if (!*delay_on && !*delay_off)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment