summary refs log tree commit diff
path: root/drivers/leds
diff options
context:
space:
mode:
authorGabriele Mazzotta <gabriele.mzt@gmail.com>2014-12-23 10:59:23 -0800
committerBryan Wu <cooloney@gmail.com>2015-01-14 10:40:19 -0800
commit56d06fdee534124f79b51ff92232373b783cddc2 (patch)
tree126c70b1e945ab98c4458182652a556cdf094ef9 /drivers/leds
parent13b695f3c41bc691028f255eae2f8e1938377565 (diff)
downloadlinux-56d06fdee534124f79b51ff92232373b783cddc2.tar.gz
leds: Don't allow brightness values greater than max_brightness
Since commit 4d71a4a12b13 ("leds: Add support for setting brightness in
a synchronous way") the value passed to brightness_set() is no longer
limited to max_brightness and can be different from the internally saved
brightness value.

Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h
index 2348dbda5269..79efe57c7405 100644
--- a/drivers/leds/leds.h
+++ b/drivers/leds/leds.h
@@ -20,7 +20,8 @@
 static inline void led_set_brightness_async(struct led_classdev *led_cdev,
 					enum led_brightness value)
 {
-	led_cdev->brightness = min(value, led_cdev->max_brightness);
+	value = min(value, led_cdev->max_brightness);
+	led_cdev->brightness = value;
 
 	if (!(led_cdev->flags & LED_SUSPENDED))
 		led_cdev->brightness_set(led_cdev, value);