---

yaml --- r: 93039 b: refs/heads/master c: 9ebed3e h: refs/heads/master i: 93037: 76cd30e 93035: 6c0afd4 93031: 7d976f4 93023: c29e25b v: v3
git-mirror · Apr 22, 2008 · 50df01f · 50df01f
1 parent fce9896
commit 50df01f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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;