From 4ad623f0036e1e89eaa721a7cdd2f67ee949ca3f Mon Sep 17 00:00:00 2001 From: Huang Shijie Date: Fri, 17 Feb 2012 11:22:37 +0800 Subject: [PATCH] --- yaml --- r: 298133 b: refs/heads/master c: d42b5de35fb058513367d1a9ee146be5aaab7c6a h: refs/heads/master i: 298131: cee08fff8e7138f21d20cae9a8c5ef790d2a4014 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ada3ab92fc19..e301508fc753 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 921de864b7c6413f15224d8f5e677541e8e1ac6d +refs/heads/master: d42b5de35fb058513367d1a9ee146be5aaab7c6a diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c index 5822e3a47ded..1e907dc8638a 100644 --- a/trunk/drivers/mtd/nand/nand_base.c +++ b/trunk/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; }