Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
	drivers/mtd/nand/nand_base.c

1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 363975b3c925..262eb4193710 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -102,6 +102,12 @@ EXPORT_SYMBOL_GPL(led_trigger_show);
 void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig)
 {
         unsigned long flags;
+        char *event = NULL;
+        char *envp[2];
+        const char *name;
+
+        name = trig ? trig->name : "none";
+        event = kasprintf(GFP_KERNEL, "TRIGGER=%s", name);
 
         /* Remove any existing trigger */
         if (led_cdev->trigger) {
@@ -109,6 +115,8 @@ void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig)
                 list_del(&led_cdev->trig_list);
                 write_unlock_irqrestore(&led_cdev->trigger->leddev_list_lock,
                         flags);
+                cancel_work_sync(&led_cdev->set_brightness_work);
+                led_stop_software_blink(led_cdev);
                 if (led_cdev->trigger->deactivate)
                         led_cdev->trigger->deactivate(led_cdev);
                 led_cdev->trigger = NULL;
@@ -122,6 +130,13 @@ void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trig)
                 if (trig->activate)
                         trig->activate(led_cdev);
         }
+
+        if (event) {
+                envp[0] = event;
+                envp[1] = NULL;
+                kobject_uevent_env(&led_cdev->dev->kobj, KOBJ_CHANGE, envp);
+                kfree(event);
+        }
 }
 EXPORT_SYMBOL_GPL(led_trigger_set);
 
@@ -224,7 +239,7 @@ void led_trigger_event(struct led_trigger *trig,
                 struct led_classdev *led_cdev;
 
                 led_cdev = list_entry(entry, struct led_classdev, trig_list);
-                __led_set_brightness(led_cdev, brightness);
+                led_set_brightness(led_cdev, brightness);
         }
         read_unlock(&trig->leddev_list_lock);
 }