Function led_set_software_blink() assumes that blink timer is still running,
but commit 488bc35bf40df89d37486c1826b178a2fba36ce7 introduced disabling
of blink timer before each call to led_set_software_blink().
Correct led_software_blink():
1) remove protection against reprogramming blink timer to the same values,
because it only disables blinking now,
2) remove unnecessary call to led_stop_software_blink().
Signed-off-by: Rafal Prylowski <[email protected]>
Cc: Bryan Wu <[email protected]>
Cc: Richard Purdie <[email protected]>
---
Patch applies to current mainline.
drivers/leds/led-core.c | 7 -------
1 file changed, 7 deletions(-)
Index: mainline/drivers/leds/led-core.c
===================================================================
--- mainline.orig/drivers/leds/led-core.c
+++ mainline/drivers/leds/led-core.c
@@ -44,13 +44,6 @@ static void led_set_software_blink(struc
if (!led_cdev->blink_brightness)
led_cdev->blink_brightness = led_cdev->max_brightness;
- if (led_get_trigger_data(led_cdev) &&
- delay_on == led_cdev->blink_delay_on &&
- delay_off == led_cdev->blink_delay_off)
- return;
-
- led_stop_software_blink(led_cdev);
-
led_cdev->blink_delay_on = delay_on;
led_cdev->blink_delay_off = delay_off;
On Mon, May 28, 2012 at 11:35 PM, Rafal Prylowski <[email protected]> wrote:
> Function led_set_software_blink() assumes that blink timer is still running,
> but commit 488bc35bf40df89d37486c1826b178a2fba36ce7 introduced disabling
> of blink timer before each call to led_set_software_blink().
>
> Correct led_software_blink():
> 1) remove protection against reprogramming blink timer to the same values,
> ? because it only disables blinking now,
> 2) remove unnecessary call to led_stop_software_blink().
>
Fair enough. Applied to my fixed-for-3.5 branch.
Thanks,
-Bryan
> Signed-off-by: Rafal Prylowski <[email protected]>
> Cc: Bryan Wu <[email protected]>
> Cc: Richard Purdie <[email protected]>
> ---
>
> Patch applies to current mainline.
>
> ?drivers/leds/led-core.c | ? ?7 -------
> ?1 file changed, 7 deletions(-)
>
> Index: mainline/drivers/leds/led-core.c
> ===================================================================
> --- mainline.orig/drivers/leds/led-core.c
> +++ mainline/drivers/leds/led-core.c
> @@ -44,13 +44,6 @@ static void led_set_software_blink(struc
> ? ? ? ?if (!led_cdev->blink_brightness)
> ? ? ? ? ? ? ? ?led_cdev->blink_brightness = led_cdev->max_brightness;
>
> - ? ? ? if (led_get_trigger_data(led_cdev) &&
> - ? ? ? ? ? delay_on == led_cdev->blink_delay_on &&
> - ? ? ? ? ? delay_off == led_cdev->blink_delay_off)
> - ? ? ? ? ? ? ? return;
> -
> - ? ? ? led_stop_software_blink(led_cdev);
> -
> ? ? ? ?led_cdev->blink_delay_on = delay_on;
> ? ? ? ?led_cdev->blink_delay_off = delay_off;
>
--
Bryan Wu <[email protected]>
Kernel Developer ? ?+86.186-168-78255 Mobile
Canonical Ltd. ? ? ?http://www.canonical.com
Ubuntu - Linux for human beings | http://www.ubuntu.com