git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
[pandora-kernel.git]
/
drivers
/
leds
/
led-class.c
diff --git
a/drivers/leds/led-class.c
b/drivers/leds/led-class.c
index
dc3d3d8
..
6d5628b
100644
(file)
--- a/
drivers/leds/led-class.c
+++ b/
drivers/leds/led-class.c
@@
-267,6
+267,8
@@
void led_blink_set(struct led_classdev *led_cdev,
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))
return;