From 757295865ffcf777b5f86a9ee1097ce5f175fdff Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Thu, 30 Jun 2011 19:53:09 +0800
Subject: [PATCH] --- yaml --- r: 274900 b: refs/heads/master c:
 a751d3155dee38cb2a8e46d8cf3fa6998b2f3239 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mtd/nand/fsl_upm.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 17c46fdbfc0f..af69e2b1f1b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 201ab536ac205a2787f8eac2eedc697616f99e04
+refs/heads/master: a751d3155dee38cb2a8e46d8cf3fa6998b2f3239
diff --git a/trunk/drivers/mtd/nand/fsl_upm.c b/trunk/drivers/mtd/nand/fsl_upm.c
index da92fed9f27b..b4f3cc9f32fb 100644
--- a/trunk/drivers/mtd/nand/fsl_upm.c
+++ b/trunk/drivers/mtd/nand/fsl_upm.c
@@ -196,6 +196,8 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
 	ret = mtd_device_parse_register(&fun->mtd, NULL, &ppdata, NULL, 0);
 err:
 	of_node_put(flash_np);
+	if (ret)
+		kfree(fun->mtd.name);
 	return ret;
 }