Skip to content

Commit

Permalink
Revert "leds: save the delay values after a successful call to blink_…
Browse files Browse the repository at this point in the history
…set()"

commit cb87151 upstream.

Revert commit 6123b0e.

The problem this patch intends to solve has alreadqy been fixed by
commit 7a5caab ("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>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Nov 21, 2011
1 parent b898822 commit 1c08c93
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/leds/led-class.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1c08c93

Please sign in to comment.