Messages in this thread | | | Date | Wed, 6 Jun 2012 09:00:08 +0200 | From | Fabio Baltieri <> | Subject | Re: [PATCH 2/2] leds: fix led_brightness_set when soft-blinking |
| |
On Wed, Jun 06, 2012 at 11:58:10AM +0800, Bryan Wu wrote: > On Wed, Jun 6, 2012 at 5:38 AM, Fabio Baltieri <fabio.baltieri@gmail.com> wrote: > > Change led_brightness_set to ensure software blink timer is stopped > > before calling led_stop_software_blink() and use led_set_brightness() > > instead of calling led_cdev->brightness_set() directly to ensure > > led_cdev->brightness is always consistent with current LED status. > > > > This ensure proper cleaning when changing triggers, as without this fix > > a LED may be turned off while leaving it's led_cdev->brightness = 1, > > leading to an erratic software-blink behaviour. > > > > The problem was easy to reproduce by changing the trigger from "timer" > > to "oneshot". > > > > Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com> > > Cc: Bryan Wu <bryan.wu@canonical.com> > > --- > > drivers/leds/led-core.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c > > index 579eb78..3e9f934 100644 > > --- a/drivers/leds/led-core.c > > +++ b/drivers/leds/led-core.c > > @@ -115,7 +115,8 @@ EXPORT_SYMBOL(led_blink_set_oneshot); > > void led_brightness_set(struct led_classdev *led_cdev, > > enum led_brightness brightness) > > { > > + del_timer_sync(&led_cdev->blink_timer); > > This is not necessary, since led_stop_software_blink() will call > del_timer_sync() as you want.
Actually I removed it in the oneshot patch because it was only needed in the non-oneshot variant of led_blink_set, but I may put it back where it was and move led_stop_software_blink earlier into led_blink_set... do you think it's better?
> > > led_stop_software_blink(led_cdev); > > - led_cdev->brightness_set(led_cdev, brightness); > > + led_set_brightness(led_cdev, brightness); > > } > > EXPORT_SYMBOL(led_brightness_set); > > -- > > 1.7.10.2.520.g6a4a482.dirty > > > > Thanks, > -- > Bryan Wu <bryan.wu@canonical.com> > Kernel Developer +86.186-168-78255 Mobile > Canonical Ltd. www.canonical.com > Ubuntu - Linux for human beings | www.ubuntu.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |