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, 1 insertions, 1 deletions

diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index 3d6531396dda..3b83406de752 100644
--- a/drivers/leds/ledtrig-timer.c
+++ b/drivers/leds/ledtrig-timer.c
@@ -166,7 +166,7 @@ static void timer_trig_activate(struct led_classdev *led_cdev)
 
         timer_data->brightness_on = led_get_brightness(led_cdev);
         if (timer_data->brightness_on == LED_OFF)
-                timer_data->brightness_on = LED_FULL;
+                timer_data->brightness_on = led_cdev->max_brightness;
         led_cdev->trigger_data = timer_data;
 
         init_timer(&timer_data->timer);