Skip to content

Commit

Permalink
leds: change ledtrig-timer to use activated flag
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shuah Khan authored and Linus Torvalds committed May 29, 2012
1 parent 03c091e commit 1381187
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/leds/ledtrig-timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_cdev->blink_delay_off);

led_cdev->trigger_data = (void *)1;
led_cdev->activated = true;

return;

Expand All @@ -98,9 +97,10 @@ static void timer_trig_activate(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_off);
led_cdev->activated = false;
}

/* Stop blinking */
Expand Down

0 comments on commit 1381187

Please sign in to comment.