From 50df01fc5da885cc6325275a6163d9df6950bc94 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Tue, 18 Mar 2008 19:34:03 +0300
Subject: [PATCH] --- yaml --- r: 93039 b: refs/heads/master c:
 9ebed3e60f9991e980e6c38b0edbdf9c8ff2ff6d h: refs/heads/master i:   93037:
 76cd30ed04d50d36fcc93531027dec7002c0db39   93035:
 6c0afd4c17904dbf990c749eb5b0d63c1ab2ee56   93031:
 7d976f4c20fae089e46d6de09d575cd54e677eef   93023:
 c29e25b7e27bb3222a6b441aeda6bb58143768d9 v: v3

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

diff --git a/[refs] b/[refs]
index ab5a15dfd2a6..ad35fcac3c0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0797881d59ab93d7d92c55411e0573977d909d4
+refs/heads/master: 9ebed3e60f9991e980e6c38b0edbdf9c8ff2ff6d
diff --git a/trunk/drivers/mtd/nand/fsl_elbc_nand.c b/trunk/drivers/mtd/nand/fsl_elbc_nand.c
index b9f9f22cd860..cb12b67ce5ef 100644
--- a/trunk/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/trunk/drivers/mtd/nand/fsl_elbc_nand.c
@@ -780,6 +780,8 @@ static int fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv)
 
 	nand_release(&priv->mtd);
 
+	kfree(priv->mtd.name);
+
 	if (priv->vbase)
 		iounmap(priv->vbase);
 
@@ -840,6 +842,12 @@ static int fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl,
 		goto err;
 	}
 
+	priv->mtd.name = kasprintf(GFP_KERNEL, "%x.flash", res.start);
+	if (!priv->mtd.name) {
+		ret = -ENOMEM;
+		goto err;
+	}
+
 	ret = fsl_elbc_chip_init(priv);
 	if (ret)
 		goto err;