| From cb871513f656bdfc48b185b55f37857b5c750c40 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <jhovold@gmail.com> |
| Date: Tue, 15 Nov 2011 14:35:52 -0800 |
| Subject: Revert "leds: save the delay values after a successful call to blink_set()" |
| |
| From: Johan Hovold <jhovold@gmail.com> |
| |
| commit cb871513f656bdfc48b185b55f37857b5c750c40 upstream. |
| |
| Revert commit 6123b0e274503a0d3588e84fbe07c9aa01bfaf5d. |
| |
| The problem this patch intends to solve has alreadqy been fixed by |
| commit 7a5caabd090b ("drivers/leds/ledtrig-timer.c: fix broken sysfs |
| delay handling"). |
| |
| Signed-off-by: Johan Hovold <jhovold@gmail.com> |
| Cc: Antonio Ospite <ospite@studenti.unina.it> |
| Cc: Johannes Berg <johannes@sipsolutions.net> |
| Cc: Richard Purdie <rpurdie@rpsys.net> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/leds/led-class.c | 5 +---- |
| 1 file changed, 1 insertion(+), 4 deletions(-) |
| |
| --- a/drivers/leds/led-class.c |
| +++ b/drivers/leds/led-class.c |
| @@ -270,11 +270,8 @@ void led_blink_set(struct led_classdev * |
| del_timer_sync(&led_cdev->blink_timer); |
| |
| if (led_cdev->blink_set && |
| - !led_cdev->blink_set(led_cdev, delay_on, delay_off)) { |
| - led_cdev->blink_delay_on = *delay_on; |
| - led_cdev->blink_delay_off = *delay_off; |
| + !led_cdev->blink_set(led_cdev, delay_on, delay_off)) |
| return; |
| - } |
| |
| /* blink with 1 Hz as default if nothing specified */ |
| if (!*delay_on && !*delay_off) |
