[PATCH] leds: use led_brightness_set in led_trigger_event

Fabio Baltieri
2012-06-11T20:56:10Z

Fix led_trigger_event() to use led_brightness_set() instead of
led_set_brightness(), so that any pending blink timer is stopped before
setting the new brightness value. Without this fix LED status may be
overridden by a pending timer.

This allows a trigger to use a mix of led_trigger_event(),
led_trigger_blink() and led_trigger_blink_oneshot() without races.

Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com>
Cc: Bryan Wu <bryan.wu@canonical.com>
---
Hi Bryan,

I found this one while working on another patch but I think it's also needed by
other drivers which mixes led_trigger_blink() and led_trigger_event(), such as
power_supply_leds.

Without this a led don't stop blinking as it should when calling
led_trigger_event().

Should not cause any harm on other drivers.

(I'm starting to find the whole led_set_brightness/led_brightness_set thing a
bit confusing BTW...)

Fabio

drivers/leds/led-triggers.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index fa0b9be..b88d3b9 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -224,7 +224,7 @@ void led_trigger_event(struct led_trigger *trig,
struct led_classdev *led_cdev;

led_cdev = list_entry(entry, struct led_classdev, trig_list);
- led_set_brightness(led_cdev, brightness);
+ led_brightness_set(led_cdev, brightness);
}
read_unlock(&trig->leddev_list_lock);
}
--
1.7.11.rc1.9.gf623ca1.dirty