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

Commit d42b5de3 authored by Huang Shijie's avatar Huang Shijie Committed by David Woodhouse
Browse files

mtd: change the location of the ONFI detected log 



Some strange nand chip(such as Hynix H27UBG8T2A) can pass the `ONFI` signature
check. So the log can be printed out even it is not an ONFI nand indeed.

Change this log to the end of the function. Print out the log only when we
really detect an ONFI nand.

Signed-off-by: default avatarHuang Shijie <b32955@freescale.com>
Acked-by: default avatarFlorian Fainelli <ffainelli@freebox.fr>
Acked-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 921de864

drivers/mtd/nand/nand_base.c

+1 −1
Original line number Diff line number Diff line
@@ -2853,7 +2853,6 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, 
		chip->read_byte(mtd) != 'F' || chip->read_byte(mtd) != 'I')

		return 0;



	pr_info("ONFI flash detected\n");

	chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1);

	for (i = 0; i < 3; i++) {

		chip->read_buf(mtd, (uint8_t *)p, sizeof(*p));
@@ -2903,6 +2902,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, 
	chip->options |= (NAND_NO_READRDY |

			NAND_NO_AUTOINCR) & NAND_CHIPOPTIONS_MSK;



	pr_info("ONFI flash detected\n");

	return 1;

}