diff options
| author | Kyungmin Park <kyungmin.park@samsung.com> | 2008-05-07 04:54:10 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-06-05 08:51:13 +0200 |
| commit | ba75321193900a236bc5bbc29145e1039f74eb1b (patch) | |
| tree | c3c81598d120b3cadc8b2316f5ceb003ae7ab58b /drivers/mtd | |
| parent | [MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path (diff) | |
| download | linux-ba75321193900a236bc5bbc29145e1039f74eb1b.tar.xz linux-ba75321193900a236bc5bbc29145e1039f74eb1b.zip | |
[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>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/omap_nor.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/onenand/generic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c index 240b0e2d095d..c12d8056bebd 100644 --- a/drivers/mtd/maps/omap_nor.c +++ b/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); 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 diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c index 3d44d040a47d..ad81ab8e95e2 100644 --- a/drivers/mtd/onenand/generic.c +++ b/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); 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 |