From adaaa59300f2a80cabd3aae3a5f6dad5663bcaa7 Mon Sep 17 00:00:00 2001 From: Matthieu CASTET Date: Tue, 6 Nov 2012 11:51:43 +0100 Subject: [PATCH] --- yaml --- r: 347213 b: refs/heads/master c: ff3206b2450499203532af2505a7f6f8413e92c0 h: refs/heads/master i: 347211: 894789889f3c9e20030b83e987b32bb82c25f499 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_base.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 03a574c3cdbc..55ab920563a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64b37b2a63eb2f80b65c7185f0013f8ffc637ae3 +refs/heads/master: ff3206b2450499203532af2505a7f6f8413e92c0 diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c index 5851c51ac2df..0ac49ca58524 100644 --- a/trunk/drivers/mtd/nand/nand_base.c +++ b/trunk/drivers/mtd/nand/nand_base.c @@ -2857,6 +2857,8 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, int i; int val; + /* ONFI need to be probed in 8 bits mode */ + WARN_ON(chip->options & NAND_BUSWIDTH_16); /* Try ONFI for unknown chip or LP */ chip->cmdfunc(mtd, NAND_CMD_READID, 0x20, -1); if (chip->read_byte(mtd) != 'O' || chip->read_byte(mtd) != 'N' ||