summaryrefslogtreecommitdiff
path: root/drivers/leds/led-class.c
diff options
context:
space:
mode:
authorEsben Haabendal <eha@doredevelopment.dk>2011-05-24 17:13:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 08:39:49 -0700
commitfff26f8141145e01eae8f4d6e642ac8a0d500158 (patch)
tree4da2d503bbb242118fdde980e045779846864a14 /drivers/leds/led-class.c
parent5ff77428e55c152ef75a6967f3266db79926fbde (diff)
downloadlinux-3.10-fff26f8141145e01eae8f4d6e642ac8a0d500158.tar.gz
linux-3.10-fff26f8141145e01eae8f4d6e642ac8a0d500158.tar.bz2
linux-3.10-fff26f8141145e01eae8f4d6e642ac8a0d500158.zip
leds: support automatic start of blinking with ledtrig-timer
By setting initial values blink_delay_on and blink_delay_off in a led_classdev struct, this change starts the blinking when the led is initialized. With this patch, you can initialize blink_delay_on and blink_delay_off in led_classdev with default_trigger set to "timer", and the led will start up blinking. The current ledtrig-timer implementation ignores any initial blink_delay_on/blink_delay_off settings, and requires setting blink_delay_on/blink_delay_off (typically from userspace) before the led blinks. Signed-off-by: Esben Haabendal <eha@doredevelopment.dk> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/leds/led-class.c')
-rw-r--r--drivers/leds/led-class.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index d5a4ade8899..dc3d3d83191 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -131,7 +131,8 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
if (!led_cdev->blink_brightness)
led_cdev->blink_brightness = led_cdev->max_brightness;
- if (delay_on == led_cdev->blink_delay_on &&
+ if (led_get_trigger_data(led_cdev) &&
+ delay_on == led_cdev->blink_delay_on &&
delay_off == led_cdev->blink_delay_off)
return;