[MTD] [NAND] fsl_elbc_nand: fix mtd name

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=9ebed3e60f9991e980e6c38b0edbdf9c8ff2ff6d
Commit:     9ebed3e60f9991e980e6c38b0edbdf9c8ff2ff6d
Parent:     f0797881d59ab93d7d92c55411e0573977d909d4
Author:     Anton Vorontsov <avorontsov at ru.mvista.com>
AuthorDate: Tue Mar 18 19:34:03 2008 +0300
Committer:  David Woodhouse <dwmw2 at infradead.org>
CommitDate: Tue Apr 22 20:50:31 2008 +0100

    [MTD] [NAND] fsl_elbc_nand: fix mtd name
    
    Currently fsl_elbc_nand doesn't initialize mtd->name, and this causes
    nand_get_flash_type() to assign name that is equal to chip type, like
    this:
    
       root at b1:~# cat /proc/mtd
       dev:    size   erasesize  name
       mtd0: 00800000 00010000 "fe000000.flash"
       mtd1: 02000000 00004000 "NAND 32MiB 3,3V 8-bit"
    
    mtd0 is physmap_of flash (normal name), and mtd1 is fsl_elbc_nand.
    
    Despite inconsistency, with mtd name like this specifying paritions
    from the kernel command line becomes a torture (though, I didn't tried
    and not sure if mtdparts= can handle spaces at all). Plus, this causes
    real bugs when multiple fsl_elbc_nand chips registered.
    
    With this patch applied fsl_elbc_nand chip will have proper name:
    
       root at b1:~# cat /proc/mtd
       dev:    size   erasesize  name
       mtd0: 00800000 00010000 "fe000000.flash"
       mtd1: 02000000 00004000 "e0600000.flash"
    
    p.s. We can't use priv->dev->bus_id as in physmap_of, because
    fsl_elbc_nand pretends to be a localbus controller, so its bus_id is
    "address.localbus", which is incorrect and thus will also not work
    for multiple chips.
    
    Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
---
 drivers/mtd/nand/fsl_elbc_nand.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index b9f9f22..cb12b67 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/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;