Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6123b0e2 authored by Antonio Ospite's avatar Antonio Ospite Committed by Linus Torvalds
Browse files

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



When calling the hardware blinking function implemented by blink_set(),
the delay_on and delay_off values are not preserved across calls.

Fix that and make the "timer" trigger work as expected when hardware
blinking is available.

BEFORE the fix:
  $ cd /sys/class/leds/someled
  $ echo timer > trigger
  $ cat delay_on delay_off
  0
  0
  $ echo 100 > delay_on
  $ cat delay_on delay_off
  0
  0
  $ echo 100 > delay_off
  $ cat delay_on delay_off
  0
  0

AFTER the fix:
  $ cd /sys/class/leds/someled
  $ echo timer > trigger
  $ cat delay_on delay_off
  0
  0
  $ echo 100 > delay_on
  $ cat delay_on delay_off
  100
  0
  $ echo 100 > delay_off
  $ cat delay_on delay_off
  100
  100

Signed-off-by: default avatarAntonio Ospite <ospite@studenti.unina.it>
Reviewed-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: <stable@kernel.org>
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 dabc69c2
Loading
Loading
Loading
Loading
+4 −1
Original line number Original line Diff line number Diff line
@@ -268,8 +268,11 @@ void led_blink_set(struct led_classdev *led_cdev,
		   unsigned long *delay_off)
		   unsigned long *delay_off)
{
{
	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)