@@ -64,7 +64,7 @@ struct txx9ndfmc_priv {
struct nand_chip chip;
struct mtd_info mtd;
int cs;
- char mtdname[BUS_ID_SIZE + 2];
+ char *mtdname;
};
#define MAX_TXX9NDFMC_DEV 4
@@ -333,12 +333,21 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
txx9_priv->dev = dev;
if (plat->ch_mask != 1) {
+ char *devname = dev_name(&dev->dev);
txx9_priv->cs = i;
+ txx9_priv->mtdname = kmalloc(strlen(devname) + 3,
+ GFP_KERNEL);
+ if (!txx9_mtdname) {
+ kfree(txx9_priv);
+ dev_err(&dev->dev,
+ "Unable to allocate TXx9 NDFMC MTD device name.\n");
+ continue;
+ }
sprintf(txx9_priv->mtdname, "%s.%u",
- dev_name(&dev->dev), i);
+ devname, i);
} else {
txx9_priv->cs = -1;
- strcpy(txx9_priv->mtdname, dev_name(&dev->dev));
+ txx9_priv->mtdname = dev_name(&dev->dev);
}
if (plat->wide_mask & (1 << i))
chip->options |= NAND_BUSWIDTH_16;
@@ -385,6 +394,8 @@ static int __exit txx9ndfmc_remove(struct platform_device *dev)
kfree(drvdata->parts[i]);
#endif
del_mtd_device(mtd);
+ if (txx9_priv->mtdname != dev_name(&dev->dev))
+ kfree(txx9_priv->mtdname);
kfree(txx9_priv);
}
return 0;