leds: fix brightness changing when software blinking is active

The following sequence:
echo timer >/sys/class/leds/<name>/trigger
echo 1 >/sys/class/leds/<name>/brightness
should change the ON brightness for blinking.
The function led_set_brightness() was mistakenly initiating the
delayed blink stop procedure, which resulted in no blinking with
the timer trigger still active.

This patch fixes the problem by changing led_set_brightness()
to not initiate the delayed blink stop when brightness is not 0.

CC: Richard Purdie <[email protected]>
CC: Kyungmin Park <[email protected]>
CC: [email protected]
CC: [email protected]
Acked-by: Jacek Anaszewski <[email protected]>
Signed-off-by: Stas Sergeev <[email protected]>
Signed-off-by: Bryan Wu <[email protected]>

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 728681debdbe437d086207f86422078bb560f774..adc38d14576bbab913378cf81b2abdefcb64f53b 100644 (file)
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -121,6 +121,11 @@ static void led_timer_function(unsigned long data)
        brightness = led_get_brightness(led_cdev);
        if (!brightness) {
                /* Time to switch the LED on. */
+               if (led_cdev->delayed_set_value) {
+                       led_cdev->blink_brightness =
+                                       led_cdev->delayed_set_value;
+                       led_cdev->delayed_set_value = 0;
+               }
                brightness = led_cdev->blink_brightness;
                delay = led_cdev->blink_delay_on;
        } else {

diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 9886dace5ad226950e0b70cc9ee2b5ccd42ff228..549de7e24cfdf445f27180ab7c776da21af50a94 100644 (file)
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -119,10 +119,11 @@ void led_set_brightness(struct led_classdev *led_cdev,
 {
        int ret = 0;
 
-       /* delay brightness setting if need to stop soft-blink timer */
+       /* delay brightness if soft-blink is active */
        if (led_cdev->blink_delay_on || led_cdev->blink_delay_off) {
                led_cdev->delayed_set_value = brightness;
-               schedule_work(&led_cdev->set_brightness_work);
+               if (brightness == LED_OFF)
+                       schedule_work(&led_cdev->set_brightness_work);
                return;
        }