summaryrefslogtreecommitdiffstats
path: root/drivers/leds/ledtrig-timer.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-07-27 09:54:47 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-07-27 09:54:47 +0200
commitaa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece (patch)
tree3f9e98fadd5124fb05e8f6f9b06aa23698d4f215 /drivers/leds/ledtrig-timer.c
parentInput: sh_keysc - fix compile warning (diff)
parentInput: synaptics - fix reporting of min coordinates (diff)
downloadlinux-aa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece.tar.xz
linux-aa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/leds/ledtrig-timer.c')
-rw-r--r--drivers/leds/ledtrig-timer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index b09bcbeade9c..d87c9d02f786 100644
--- a/drivers/leds/ledtrig-timer.c
+++ b/drivers/leds/ledtrig-timer.c
@@ -91,6 +91,9 @@ static void timer_trig_activate(struct led_classdev *led_cdev)
if (rc)
goto err_out_delayon;
+ led_blink_set(led_cdev, &led_cdev->blink_delay_on,
+ &led_cdev->blink_delay_off);
+
led_cdev->trigger_data = (void *)1;
return;