drivers/leds/led-triggers.c: fix memory leak

The memory for struct led_trigger should be kfreed in the
led_trigger_register() error path.  Also this function should return NULL
on error.

Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 4bebae733349..6f1ff93d7cec 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -261,9 +261,12 @@ void led_trigger_register_simple(const char *name, struct led_trigger **tp)
         if (trigger) {
                 trigger->name = name;
                 err = led_trigger_register(trigger);
-                if (err < 0)
+                if (err < 0) {
+                        kfree(trigger);
+                        trigger = NULL;
                         printk(KERN_WARNING "LED trigger %s failed to register"
                                 " (%d)\n", name, err);
+                }
         } else
                 printk(KERN_WARNING "LED trigger %s failed to register"
                         " (no memory)\n", name);