diff options
| author | Johan Hovold <jhovold@gmail.com> | 2011-11-15 14:35:52 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-21 14:31:19 -0800 |
| commit | 30b205cbe5b6b239e13829ff435c726c2a206e8d (patch) | |
| tree | c73b619cf5c206bf3de292ecade33795580a9e16 /drivers/leds | |
| parent | 3bbea6b4bca6ac2529fbbb71e58323a00592edae (diff) | |
| download | kernel_samsung_aries-30b205cbe5b6b239e13829ff435c726c2a206e8d.zip kernel_samsung_aries-30b205cbe5b6b239e13829ff435c726c2a206e8d.tar.gz kernel_samsung_aries-30b205cbe5b6b239e13829ff435c726c2a206e8d.tar.bz2 | |
Revert "leds: save the delay values after a successful call to blink_set()"
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>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/led-class.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 661b692..6d5628b 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -270,11 +270,8 @@ void led_blink_set(struct led_classdev *led_cdev, 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) |