The patch titled Subject: leds: change ledtrig-timer to use activated flag has been added to the -mm tree. Its filename is leds-change-ledtrig-timer-to-use-activated-flag.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Shuah Khan <shuahkhan@xxxxxxxxx> Subject: 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@xxxxxxxxx> Cc: Richard Purdie <rpurdie@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/leds/ledtrig-timer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/leds/ledtrig-timer.c~leds-change-ledtrig-timer-to-use-activated-flag drivers/leds/ledtrig-timer.c --- a/drivers/leds/ledtrig-timer.c~leds-change-ledtrig-timer-to-use-activated-flag +++ a/drivers/leds/ledtrig-timer.c @@ -87,8 +87,7 @@ static void timer_trig_activate(struct l 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; @@ -98,9 +97,10 @@ err_out_delayon: 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 */ _ Subject: Subject: leds: change ledtrig-timer to use activated flag Patches currently in -mm which might be from shuahkhan@xxxxxxxxx are linux-next.patch leds-add-led-driver-for-lm3556-chip.patch leds-simple_strtoul-cleanup.patch leds-add-new-field-to-led_classdev-struct-to-save-activation-state.patch leds-change-existing-triggers-to-use-activated-flag.patch leds-change-ledtrig-timer-to-use-activated-flag.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html