aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mtd/nand/txx9ndfmc.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 5f919e6..488088e 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -336,20 +336,21 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
txx9_priv->cs = i;
txx9_priv->mtdname = kasprintf(GFP_KERNEL, "%s.%u",
dev_name(&dev->dev), i);
- if (!txx9_priv->mtdname) {
- kfree(txx9_priv);
- dev_err(&dev->dev,
- "Unable to allocate TXx9 NDFMC MTD device name.\n");
- continue;
- }
} else {
txx9_priv->cs = -1;
- txx9_priv->mtdname = dev_name(&dev->dev);
+ txx9_priv->mtdname = kstrdup(dev_name(&dev->dev),
+ GFP_KERNEL);
+ }
+ if (!txx9_priv->mtdname) {
+ kfree(txx9_priv);
+ dev_err(&dev->dev, "Unable to allocate MTD name.\n");
+ continue;
}
if (plat->wide_mask & (1 << i))
chip->options |= NAND_BUSWIDTH_16;
if (nand_scan(mtd, 1)) {
+ kfree(txx9_priv->mtdname);
kfree(txx9_priv);
continue;
}
@@ -391,8 +392,7 @@ 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->mtdname);
kfree(txx9_priv);
}
return 0;