Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[pandora-kernel.git] / drivers / leds / leds.h

diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h
index 0214799..2dd8ecb 100644 (file)
--- 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);
@@ -41,9 +41,9 @@ void led_trigger_set(struct led_classdev *led_cdev,
                        struct led_trigger *trigger);
 void led_trigger_remove(struct led_classdev *led_cdev);
 #else
-#define led_trigger_set_default(x) do {} while(0)
-#define led_trigger_set(x, y) do {} while(0)
-#define led_trigger_remove(x) do {} while(0)
+#define led_trigger_set_default(x) do {} while (0)
+#define led_trigger_set(x, y) do {} while (0)
+#define led_trigger_remove(x) do {} while (0)
 #endif
 
 ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,