Merge branch 'akpm' (patches from Andrew)

[firefly-linux-kernel-4.4.55.git] / drivers / leds / leds.h

diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h
index 2348dbda526948b380ca2c2c7bfab6e4e5e73f75..79efe57c74058ffd8fecf6583257f3b6c193b3dd 100644 (file)
--- 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);