Commit cb871513 authored Nov 15, 2011 by Johan Hovold Committed by Linus Torvalds Nov 15, 2011

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: Johan 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 9f35a33b

drivers/leds/led-class.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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)

Admin message