浏览代码

[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>
Kyungmin Park 17 年之前
父节点
当前提交
ba75321193
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/mtd/maps/omap_nor.c
  2. 1 1
      drivers/mtd/onenand/generic.c

+ 1 - 1
drivers/mtd/maps/omap_nor.c

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

+ 1 - 1
drivers/mtd/onenand/generic.c

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