Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 698f7a4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/~dwmw2/mtd-2.6.26 

* git://git.infradead.org/~dwmw2/mtd-2.6.26:
  [MTD] [MAPS] Fix cmdlineparse handling in mapping files
  [MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path
parents adbd5886 ba753211

drivers/mtd/maps/omap_nor.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/mtd/nand/pxa3xx_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -1216,7 +1216,7 @@ static int pxa3xx_nand_resume(struct platform_device *pdev) 


	clk_enable(info->clk);



	return pxa3xx_nand_config_flash(info);

	return pxa3xx_nand_config_flash(info, info->flash_info);

}

#else

#define pxa3xx_nand_suspend	NULL

drivers/mtd/onenand/generic.c

+1 −1
Original line number Diff line number Diff line
@@ -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