diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-04-19 16:17:42 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-04-19 16:17:42 -0700 |
| commit | 4cd5ca7677c762cf6fb649211d8a7e546e1e6a8b (patch) | |
| tree | c067da7e71964f6fa475ac92faf0cd28818f6e9a /drivers/leds | |
| parent | 635aaea87060186666212363e26acc5207873b32 (diff) | |
| parent | 84c606de0617ba304bca456f0ad06729198a5333 (diff) | |
| download | kernel_samsung_tuna-4cd5ca7677c762cf6fb649211d8a7e546e1e6a8b.zip kernel_samsung_tuna-4cd5ca7677c762cf6fb649211d8a7e546e1e6a8b.tar.gz kernel_samsung_tuna-4cd5ca7677c762cf6fb649211d8a7e546e1e6a8b.tar.bz2 | |
Merge linux-omap-3.0 into android-omap-3.0
Change-Id: I86dcae86b15baab2cb26e2c53faafb57c606a2b5
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/led-class.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index dc3d3d8..6d5628b 100644 --- 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; |