From e485ca6410364912c8442fb87bc98253cc4092a7 Mon Sep 17 00:00:00 2001
From: Masakazu Mokuno <Masakazu.Mokuno@jp.sony.com>
Date: Mon, 31 Oct 2011 17:11:59 -0700
Subject: [PATCH] --- yaml --- r: 272204 b: refs/heads/master c:
 cba4c2ac080e170732a030afc27664b00f838e03 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/leds/led-triggers.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 282f42580867..055184dad6e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f59b6f9f323ff1b4567a69f9063cdd8bb57805e6
+refs/heads/master: cba4c2ac080e170732a030afc27664b00f838e03
diff --git a/trunk/drivers/leds/led-triggers.c b/trunk/drivers/leds/led-triggers.c
index 4bebae733349..6f1ff93d7cec 100644
--- a/trunk/drivers/leds/led-triggers.c
+++ b/trunk/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);