Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index ac435f205045e8a5f1d55643f7cdea20af98beac..40b0741f6ab23b0de80911230ef91844aae44da2 100644 (file)
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1242,12 +1242,10 @@ int board_nand_init(struct nand_chip *this)
                this->ecc.mode = NAND_ECC_HW;
        }
 
-       if (this->ecc.mode == NAND_ECC_HW) {
-               if (is_mxc_nfc_1())
-                       this->ecc.strength = 1;
-               else
-                       this->ecc.strength = 4;
-       }
+       if (is_mxc_nfc_1())
+               this->ecc.strength = 1;
+       else
+               this->ecc.strength = 4;
 
        host->pagesize_2k = 0;