summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mtd/nand/omap2.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 2a52101120d4..084934a9f19c 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1856,6 +1856,15 @@ static int omap_nand_probe(struct platform_device *pdev)
1856 nand_chip->ecc.priv = NULL; 1856 nand_chip->ecc.priv = NULL;
1857 nand_set_flash_node(nand_chip, dev->of_node); 1857 nand_set_flash_node(nand_chip, dev->of_node);
1858 1858
1859 if (!mtd->name) {
1860 mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL,
1861 "omap2-nand.%d", info->gpmc_cs);
1862 if (!mtd->name) {
1863 dev_err(&pdev->dev, "Failed to set MTD name\n");
1864 return -ENOMEM;
1865 }
1866 }
1867
1859 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1868 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1860 nand_chip->IO_ADDR_R = devm_ioremap_resource(&pdev->dev, res); 1869 nand_chip->IO_ADDR_R = devm_ioremap_resource(&pdev->dev, res);
1861 if (IS_ERR(nand_chip->IO_ADDR_R)) 1870 if (IS_ERR(nand_chip->IO_ADDR_R))