From bf3f816c1ec688c72d13898df0a4f2a06d77d7ea Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Wed, 7 May 2008 11:54:10 +0900 Subject: [PATCH] --- yaml --- r: 97699 b: refs/heads/master c: ba75321193900a236bc5bbc29145e1039f74eb1b h: refs/heads/master i: 97697: 051d13daabb93606bbd285845e2c69baa23cc5db 97695: dddd85eac33c897393a752612857c3c4e3b2cb9b v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/omap_nor.c | 2 +- trunk/drivers/mtd/onenand/generic.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d57465efb8a3..ad13099fd97f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b62d864314736fb6cc5c5db5b964d4a3c093424 +refs/heads/master: ba75321193900a236bc5bbc29145e1039f74eb1b diff --git a/trunk/drivers/mtd/maps/omap_nor.c b/trunk/drivers/mtd/maps/omap_nor.c index 240b0e2d095d..c12d8056bebd 100644 --- a/trunk/drivers/mtd/maps/omap_nor.c +++ b/trunk/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/trunk/drivers/mtd/onenand/generic.c b/trunk/drivers/mtd/onenand/generic.c index 3d44d040a47d..ad81ab8e95e2 100644 --- a/trunk/drivers/mtd/onenand/generic.c +++ b/trunk/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