Merge tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / leds / ledtrig-backlight.c

diff --git a/drivers/leds/ledtrig-backlight.c b/drivers/leds/ledtrig-backlight.c
index 2b513a2ad7dec3b7d81b934e8d852903f73548c9..e2726867c5d42c7a5f2cc6c37b786d922eb0b883 100644 (file)
--- a/drivers/leds/ledtrig-backlight.c
+++ b/drivers/leds/ledtrig-backlight.c
@@ -120,6 +120,7 @@ static void bl_trig_activate(struct led_classdev *led)
        ret = fb_register_client(&n->notifier);
        if (ret)
                dev_err(led->dev, "unable to register backlight trigger\n");
+       led->activated = true;
 
        return;
 
@@ -133,10 +134,11 @@ static void bl_trig_deactivate(struct led_classdev *led)
        struct bl_trig_notifier *n =
                (struct bl_trig_notifier *) led->trigger_data;
 
-       if (n) {
+       if (led->activated) {
                device_remove_file(led->dev, &dev_attr_inverted);
                fb_unregister_client(&n->notifier);
                kfree(n);
+               led->activated = false;
        }
 }