summaryrefslogtreecommitdiffstats
path: root/drivers/leds/led-triggers.c
diff options
context:
space:
mode:
authorFabio Baltieri <fabio.baltieri@gmail.com>2012-06-15 02:33:35 +0800
committerBryan Wu <bryan.wu@canonical.com>2012-07-24 07:52:34 +0800
commita0193cbee0809d65362a0767b2d50306b145b2f5 (patch)
treefaefec0305d70e63fcd00714ddc804ab6f39f234 /drivers/leds/led-triggers.c
parent19cd67e2d51225b164560b54b85f943e07deee8a (diff)
downloadop-kernel-dev-a0193cbee0809d65362a0767b2d50306b145b2f5.zip
op-kernel-dev-a0193cbee0809d65362a0767b2d50306b145b2f5.tar.gz
leds: use led_set_brightness in led_trigger_event
Fix led_trigger_event() to use led_set_brightness() 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. (applied over: leds: Rename led_brightness_set() to led_set_brightness()) Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com> Cc: Shuah Khan <shuahkhan@gmail.com> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Diffstat (limited to 'drivers/leds/led-triggers.c')
-rw-r--r--drivers/leds/led-triggers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 57721f2..de1c59d 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_set_brightness(led_cdev, brightness);
}
read_unlock(&trig->leddev_list_lock);
}
OpenPOWER on IntegriCloud