mtd: change the location of the ONFI detected log

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=d42b5de35fb058513367d1a9ee146be5aaab7c6a
Commit:     d42b5de35fb058513367d1a9ee146be5aaab7c6a
Parent:     921de864b7c6413f15224d8f5e677541e8e1ac6d
Author:     Huang Shijie <b32955 at freescale.com>
AuthorDate: Fri Feb 17 11:22:37 2012 +0800
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Tue Mar 27 00:38:37 2012 +0100

    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: Huang Shijie <b32955 at freescale.com>
    Acked-by: Florian Fainelli <ffainelli at freebox.fr>
    Acked-by: Brian Norris <computersforpeace at gmail.com>
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy at linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/nand_base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 5822e3a..1e907dc 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -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;
 }