From 59a37210b71b179d5c8eb9932ec3c127afd3874c Mon Sep 17 00:00:00 2001 From: Gary King Date: Mon, 28 Jun 2010 15:00:10 -0700 Subject: [PATCH] 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 --- drivers/mtd/devices/tegra_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.34.1