The generic rule for partition scan is to try all supported
partition types before an usable partition table is found.
However the original code returns unsuccessful when there is
an error in any of the partition types.
Signed-off-by: Li Yang <[EMAIL PROTECTED]>
Cc: Stefan Roese <[EMAIL PROTECTED]>
Cc: Peter Korsgaard <[EMAIL PROTECTED]>
---
I later found that Stefan has proposed a similar patch for physmap_of
and Peter proposed another patch to fix cmdlinepart instead.
I'd say that even after cmdlinepart patch is applied the scan control
logic still needs to be fixed.
drivers/mtd/maps/physmap_of.c | 12 ++----------
drivers/mtd/nand/fsl_elbc_nand.c | 7 +------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 49acd41..5ebbbc4 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -225,23 +225,15 @@ static int __devinit of_flash_probe(struct of_device *dev,
* line, these take precedence over device tree information */
err = parse_mtd_partitions(info->mtd, part_probe_types,
&info->parts, 0);
- if (err < 0)
- return err;
#ifdef CONFIG_MTD_OF_PARTS
- if (err == 0) {
+ if (err <= 0)
err = of_mtd_parse_partitions(&dev->dev, info->mtd,
dp, &info->parts);
- if (err < 0)
- return err;
- }
#endif
- if (err == 0) {
+ if (err <= 0)
err = parse_obsolete_partitions(dev, info, dp);
- if (err < 0)
- return err;
- }
if (err > 0)
add_mtd_partitions(info->mtd, info->parts, err);
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index b025dfe..72e9bd9 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -1054,16 +1054,11 @@ static int fsl_elbc_chip_probe(struct fsl_elbc_ctrl
*ctrl,
/* First look for RedBoot table or partitions on the command
* line, these take precedence over device tree information */
ret = parse_mtd_partitions(&priv->mtd, part_probe_types, &parts, 0);
- if (ret < 0)
- goto err;
#ifdef CONFIG_MTD_OF_PARTS
- if (ret == 0) {
+ if (ret <= 0)
ret = of_mtd_parse_partitions(priv->dev, &priv->mtd,
node, &parts);
- if (ret < 0)
- goto err;
- }
#endif
if (ret > 0)
--
1.5.4.rc4
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
