summaryrefslogtreecommitdiffstats
path: root/drivers/leds/leds.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2009-04-22 13:02:09 +1000
committerPaul Mackerras <paulus@samba.org>2009-04-22 13:02:09 +1000
commit5bd3ef84d73c2ea7b4babbad060909753c4828d4 (patch)
treefdf2bafb48ae1ed03175f6c77a7548a181e69ee9 /drivers/leds/leds.h
parent0658c16056660886ea2f35c4f038be70a94b1532 (diff)
parent6d25b688ecc488753af3c9e6f6a9a575b863cf37 (diff)
downloadkernel-crypto-5bd3ef84d73c2ea7b4babbad060909753c4828d4.tar.gz
kernel-crypto-5bd3ef84d73c2ea7b4babbad060909753c4828d4.tar.xz
kernel-crypto-5bd3ef84d73c2ea7b4babbad060909753c4828d4.zip
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
Diffstat (limited to 'drivers/leds/leds.h')
-rw-r--r--drivers/leds/leds.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h
index 5edbf52c4fa..2dd8ecbfdc3 100644
--- a/drivers/leds/leds.h
+++ b/drivers/leds/leds.h
@@ -20,8 +20,8 @@
static inline void led_set_brightness(struct led_classdev *led_cdev,
enum led_brightness value)
{
- if (value > LED_FULL)
- value = LED_FULL;
+ if (value > led_cdev->max_brightness)
+ value = led_cdev->max_brightness;
led_cdev->brightness = value;
if (!(led_cdev->flags & LED_SUSPENDED))
led_cdev->brightness_set(led_cdev, value);