1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 63aad90247c4..ac05a928f764 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -24,6 +24,12 @@
 
 static struct class *leds_class;
 
+static void led_update_brightness(struct led_classdev *led_cdev)
+{
+        if (led_cdev->brightness_get)
+                led_cdev->brightness = led_cdev->brightness_get(led_cdev);
+}
+
 static ssize_t led_brightness_show(struct device *dev, 
                 struct device_attribute *attr, char *buf)
 {
@@ -31,6 +37,7 @@ static ssize_t led_brightness_show(struct device *dev,
         ssize_t ret = 0;
 
         /* no lock needed for this */
+        led_update_brightness(led_cdev);
         sprintf(buf, "%u\n", led_cdev->brightness);
         ret = strlen(buf) + 1;
 
@@ -51,6 +58,9 @@ static ssize_t led_brightness_store(struct device *dev,
 
         if (count == size) {
                 ret = count;
+
+                if (state == LED_OFF)
+                        led_trigger_remove(led_cdev);
                 led_set_brightness(led_cdev, state);
         }
 
@@ -110,6 +120,8 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
         list_add_tail(&led_cdev->node, &leds_list);
         up_write(&leds_list_lock);
 
+        led_update_brightness(led_cdev);
+
 #ifdef CONFIG_LEDS_TRIGGERS
         init_rwsem(&led_cdev->trigger_lock);