Patchwork mtd: atmel_nand: move the sanity check to the beginning of pmecc_enable()

login
register
mail settings
Submitter Wu, Josh
Date Aug. 7, 2013, 9:58 a.m.
Message ID <1375869491-25137-1-git-send-email-josh.wu@atmel.com>
Download mbox | patch
Permalink /patch/265458/
State Accepted
Commit 1fad0e8b9a8889f6ca79be570e06d00785f15aed
Headers show

Comments

Wu, Josh - Aug. 7, 2013, 9:58 a.m.
It is better to do the sanity check for the parameter before any hardware
operation.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
 drivers/mtd/nand/atmel_nand.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Brian Norris - Aug. 8, 2013, 6:24 a.m.
On Wed, Aug 07, 2013 at 05:58:11PM +0800, Josh Wu wrote:
> It is better to do the sanity check for the parameter before any hardware
> operation.
> 
> Signed-off-by: Josh Wu <josh.wu@atmel.com>

Pushed to l2-mtd.git. I would squash it into the original patch, but
David has already taken it into his tree. I'll leave it up to him, then.

Thanks,
Brian

Patch

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 1ffa52f..0e365da 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -905,15 +905,15 @@  static void pmecc_enable(struct atmel_nand_host *host, int ecc_op)
 {
 	u32 val;
 
-	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_RST);
-	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DISABLE);
-	val = pmecc_readl_relaxed(host->ecc, CFG);
-
 	if (ecc_op != NAND_ECC_READ && ecc_op != NAND_ECC_WRITE) {
 		dev_err(host->dev, "atmel_nand: wrong pmecc operation type!");
 		return;
 	}
 
+	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_RST);
+	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DISABLE);
+	val = pmecc_readl_relaxed(host->ecc, CFG);
+
 	if (ecc_op == NAND_ECC_READ)
 		pmecc_writel(host->ecc, CFG, (val & ~PMECC_CFG_WRITE_OP)
 			| PMECC_CFG_AUTO_ENABLE);