Commit 13811879 authored by Shuah Khan's avatar Shuah Khan Committed by Linus Torvalds

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: default avatarShuah Khan <shuahkhan@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Bryan Wu <bryan.wu@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 03c091e5
...@@ -87,8 +87,7 @@ static void timer_trig_activate(struct led_classdev *led_cdev) ...@@ -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) ...@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment