The patch titled leds ledtrig-timer: on deactivation hardware blinking should be disabled. has been added to the -mm tree. Its filename is leds-ledtrig-timer-on-deactivation-hardware-blinking-should-be-disabled.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 *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: leds ledtrig-timer: on deactivation hardware blinking should be disabled. From: Rodolfo Giometti <giometti@xxxxxxxx> Signed-off-by: Rodolfo Giometti <giometti@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/leds/ledtrig-timer.c | 5 +++++ 1 file changed, 5 insertions(+) diff -puN drivers/leds/ledtrig-timer.c~leds-ledtrig-timer-on-deactivation-hardware-blinking-should-be-disabled drivers/leds/ledtrig-timer.c --- a/drivers/leds/ledtrig-timer.c~leds-ledtrig-timer-on-deactivation-hardware-blinking-should-be-disabled +++ a/drivers/leds/ledtrig-timer.c @@ -199,6 +199,7 @@ err_out: static void timer_trig_deactivate(struct led_classdev *led_cdev) { struct timer_trig_data *timer_data = led_cdev->trigger_data; + unsigned long on = 0, off = 0; if (timer_data) { device_remove_file(led_cdev->dev, &dev_attr_delay_on); @@ -206,6 +207,10 @@ static void timer_trig_deactivate(struct del_timer_sync(&timer_data->timer); kfree(timer_data); } + + /* If there is hardware support for blinking, stop it */ + if (led_cdev->blink_set) + led_cdev->blink_set(led_cdev, &on, &off); } static struct led_trigger timer_led_trigger = { _ Patches currently in -mm which might be from giometti@xxxxxxxx are linux-next.patch leds-ledtrig-timer-on-deactivation-hardware-blinking-should-be-disabled.patch linuxpps-core-support.patch linuxpps-core-support-sysfs-not-needed-variables-removed.patch pps-userland-header-file-for-pps-api.patch pps-documentation-programs-and-examples.patch pps-linuxpps-clients-support.patch ldisc-new-dcd_change-method-for-line-disciplines.patch ldisc-n_tty-export-all-n_tty-ldisc-methods.patch ldisc-n_tty-export-all-n_tty-ldisc-methods-fix.patch pps-serial-clients-support.patch pps-serial-clients-support-avoid-noisy-compilation-on-64bits-architecture.patch pps-parallel-port-clients-support.patch pps-low-level-irq-timestamps-recording.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