From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Thu, 13 Dec 2007 00:39:29 +0000 (+0900)
Subject: [MTD] [OneNAND] Check the initial bad block using ONENAND_CTRL_ERROR
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b2581be291aa8595eadf3d6933d04d0f1d01b46d;p=openwrt%2Fstaging%2Fblogic.git

[MTD] [OneNAND] Check the initial bad block using ONENAND_CTRL_ERROR

Some chips don't set the ONENAND_CTRL_LOAD bit.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---

diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index cf8009329999..44c327a335e7 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1119,12 +1119,10 @@ static int onenand_bbt_wait(struct mtd_info *mtd, int state)
 	interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
 	ctrl = this->read_word(this->base + ONENAND_REG_CTRL_STATUS);
 
+	/* Initial bad block case: 0x2400 or 0x0400 */
 	if (ctrl & ONENAND_CTRL_ERROR) {
 		printk(KERN_DEBUG "onenand_bbt_wait: controller error = 0x%04x\n", ctrl);
-		/* Initial bad block case */
-		if (ctrl & ONENAND_CTRL_LOAD)
-			return ONENAND_BBT_READ_ERROR;
-		return ONENAND_BBT_READ_FATAL_ERROR;
+		return ONENAND_BBT_READ_ERROR;
 	}
 
 	if (interrupt & ONENAND_INT_READ) {