Merge branch 'linus' into perfcounters/core

Merge reason: need the upstream facility added by:

  7f1e2ca: hrtimer: fix rq->lock inversion (again)

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h
index 5edbf52c4fa7..2dd8ecbfdc31 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);