diff options
| author | Gary King <gking@nvidia.com> | 2010-06-28 15:00:10 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:34:49 -0800 |
| commit | b81bea754492793688456633bb1e21e5574b887b (patch) | |
| tree | 5ba15b2210ead9aa6854a6c224631c4914e7aeb4 | |
| parent | 4e27c5bf74da8e479312e43294cf992078a62e9a (diff) | |
mtd/tegra_nand: don't ignore return value for add_mtd_partitions
when the mtd partition command line format is used, ignoring the
return value left err set to the number of partitions, which was
later interpreted as an error return code for tegra_nand_probe,
which caused the MTD master to be unregistered (ultimately causing
NULL pointer derefs when mounting the root partition).
Change-Id: Icebfb295810554617c56deeafc91bc22cc43bb35
Signed-off-by: Gary King <gking@nvidia.com>
| -rw-r--r-- | drivers/mtd/devices/tegra_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/tegra_nand.c b/drivers/mtd/devices/tegra_nand.c index 4a7dd4c6f656..6982a74ce65b 100644 --- a/drivers/mtd/devices/tegra_nand.c +++ b/drivers/mtd/devices/tegra_nand.c @@ -1517,7 +1517,7 @@ tegra_nand_probe(struct platform_device *pdev) #ifdef CONFIG_MTD_PARTITIONS err = parse_mtd_partitions(mtd, part_probes, &info->parts, 0); if (err > 0) { - add_mtd_partitions(mtd, info->parts, err); + err = add_mtd_partitions(mtd, info->parts, err); } else if (err <= 0 && plat->parts) { err = add_mtd_partitions(mtd, plat->parts, plat->nr_parts); } else |