Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba753211 authored May 07, 2008 by Kyungmin Park Committed by David Woodhouse Jun 05, 2008

[MTD] [MAPS] Fix cmdlineparse handling in mapping files



Now it returns the 0 if cmdlineparse not supplied.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

parent 9b62d864

drivers/mtd/maps/omap_nor.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ static int __init omapflash_probe(struct platform_device *pdev)
		err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0);
		if (err > 0)
		add_mtd_partitions(info->mtd, info->parts, err);
		else if (err < 0 && pdata->parts)
		else if (err <= 0 && pdata->parts)
		add_mtd_partitions(info->mtd, pdata->parts, pdata->nr_parts);
		else
		#endif

drivers/mtd/onenand/generic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ static int __devinit generic_onenand_probe(struct device *dev)
		err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0);
		if (err > 0)
		add_mtd_partitions(&info->mtd, info->parts, err);
		else if (err < 0 && pdata->parts)
		else if (err <= 0 && pdata->parts)
		add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts);
		else
		#endif