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

Commit af9b9a53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-20120706' of git://git.infradead.org/linux-mtd 

Pull two MTD fixes from David Woodhouse:
 - Fix a logic error in OLPC CAFÉ NAND ready() function.
 - Fix regression due to bitflip handling changes.

* tag 'for-linus-20120706' of git://git.infradead.org/linux-mtd:
  mtd: cafe_nand: fix an & vs | mistake
  mtd: nand: initialize bitflip_threshold prior to BBT scanning
parents 9ab4233d 48f8b641

drivers/mtd/nand/cafe_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL }; 
static int cafe_device_ready(struct mtd_info *mtd)

{

	struct cafe_priv *cafe = mtd->priv;

	int result = !!(cafe_readl(cafe, NAND_STATUS) | 0x40000000);

	int result = !!(cafe_readl(cafe, NAND_STATUS) & 0x40000000);

	uint32_t irqs = cafe_readl(cafe, NAND_IRQ);



	cafe_writel(cafe, irqs, NAND_IRQ);

drivers/mtd/nand/nand_base.c

+7 −0
Original line number Diff line number Diff line
@@ -3501,6 +3501,13 @@ int nand_scan_tail(struct mtd_info *mtd) 
	/* propagate ecc info to mtd_info */

	mtd->ecclayout = chip->ecc.layout;

	mtd->ecc_strength = chip->ecc.strength;

	/*

	 * Initialize bitflip_threshold to its default prior scan_bbt() call.

	 * scan_bbt() might invoke mtd_read(), thus bitflip_threshold must be

	 * properly set.

	 */

	if (!mtd->bitflip_threshold)

		mtd->bitflip_threshold = mtd->ecc_strength;



	/* Check, if we should skip the bad block table scan */

	if (chip->options & NAND_SKIP_BBTSCAN)