[lkml]   [2011]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[040/262] leds: turn the blink_timer off before starting to blink
3.0-stable review patch.  If anyone has any objections, please let me know.


From: Antonio Ospite <>

commit 488bc35bf40df89d37486c1826b178a2fba36ce7 upstream.

Depending on the implementation of the hardware blinking function in
blink_set(), the led can support hardware blinking for some values of
delay_on and delay_off and fall-back to software blinking for some other

Turning off the blink_timer unconditionally before starting to blink
make sure that a sequence like:

hardware blinking
software blinking
hardware blinking

does not leave the software blinking timer active.

Signed-off-by: Antonio Ospite <>
Reviewed-by: Johannes Berg <>
Cc: Richard Purdie <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Greg Kroah-Hartman <>

drivers/leds/led-class.c | 2 ++
1 file changed, 2 insertions(+)

--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -267,6 +267,8 @@ void led_blink_set(struct led_classdev *
unsigned long *delay_on,
unsigned long *delay_off)
+ del_timer_sync(&led_cdev->blink_timer);
if (led_cdev->blink_set &&
!led_cdev->blink_set(led_cdev, delay_on, delay_off)) {
led_cdev->blink_delay_on = *delay_on;

 \ /
  Last update: 2011-11-10 06:29    [W:0.274 / U:9.992 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site