openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

leds: change ledtrig-timer to use activated flag 

Change existing timer trigger to use the new ->activated flag to set
activate successful status in activate routine and check it in deactivate
routine to do cleanup.

Signed-off-by: Shuah Khan <shuahkhan@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Bryan Wu <bryan.wu@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Shuah Khan 2012-05-29 15:07:28 -07:00 committed by Linus Torvalds
parent 03c091e5b7
commit 1381187991
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/leds/ledtrig-timer.c
View File

@ -87,8 +87,7 @@ static void timer_trig_activate(struct led_classdev *led_cdev)
led_blink_set(led_cdev, &led_cdev->blink_delay_on, led_blink_set(led_cdev, &led_cdev->blink_delay_on,
&led_cdev->blink_delay_off); &led_cdev->blink_delay_off);
led_cdev->activated = true;
led_cdev->trigger_data = (void *)1;
return; return;
@ -98,9 +97,10 @@ static void timer_trig_activate(struct led_classdev *led_cdev)
static void timer_trig_deactivate(struct led_classdev *led_cdev) static void timer_trig_deactivate(struct led_classdev *led_cdev)
{ {
if (led_cdev->trigger_data) { if (led_cdev->activated) {
device_remove_file(led_cdev->dev, &dev_attr_delay_on); device_remove_file(led_cdev->dev, &dev_attr_delay_on);
device_remove_file(led_cdev->dev, &dev_attr_delay_off); device_remove_file(led_cdev->dev, &dev_attr_delay_off);
led_cdev->activated = false;
} }
/* Stop blinking */ /* Stop blinking */