diff options
author | Josh Wu <josh.wu@atmel.com> | 2013-08-07 05:58:11 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-08-30 16:34:36 -0400 |
commit | 1fad0e8b9a8889f6ca79be570e06d00785f15aed (patch) | |
tree | d44e7bbc5ba28704feb1b65da9ee7229f0312db4 /drivers | |
parent | e09f7f992833ed73f1afc5eaa7cc4d5b10b04b7c (diff) |
mtd: atmel_nand: move the sanity check to the beginning of pmecc_enable()
It is better to do the sanity check for the parameter before any hardware
operation.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 1ffa52f7ab4a..0e365daad9cc 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) | |||
905 | { | 905 | { |
906 | u32 val; | 906 | u32 val; |
907 | 907 | ||
908 | pmecc_writel(host->ecc, CTRL, PMECC_CTRL_RST); | ||
909 | pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DISABLE); | ||
910 | val = pmecc_readl_relaxed(host->ecc, CFG); | ||
911 | |||
912 | if (ecc_op != NAND_ECC_READ && ecc_op != NAND_ECC_WRITE) { | 908 | if (ecc_op != NAND_ECC_READ && ecc_op != NAND_ECC_WRITE) { |
913 | dev_err(host->dev, "atmel_nand: wrong pmecc operation type!"); | 909 | dev_err(host->dev, "atmel_nand: wrong pmecc operation type!"); |
914 | return; | 910 | return; |
915 | } | 911 | } |
916 | 912 | ||
913 | pmecc_writel(host->ecc, CTRL, PMECC_CTRL_RST); | ||
914 | pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DISABLE); | ||
915 | val = pmecc_readl_relaxed(host->ecc, CFG); | ||
916 | |||
917 | if (ecc_op == NAND_ECC_READ) | 917 | if (ecc_op == NAND_ECC_READ) |
918 | pmecc_writel(host->ecc, CFG, (val & ~PMECC_CFG_WRITE_OP) | 918 | pmecc_writel(host->ecc, CFG, (val & ~PMECC_CFG_WRITE_OP) |
919 | | PMECC_CFG_AUTO_ENABLE); | 919 | | PMECC_CFG_AUTO_ENABLE); |