mtd: mxc_nand: Fix crash after MTD resync
authorMarek Vasut <[email protected]>
Wed, 3 Jul 2013 00:34:34 +0000 (02:34 +0200)
committerScott Wood <[email protected]>
Fri, 12 Jul 2013 21:12:33 +0000 (16:12 -0500)
The driver triggered a BUG() in nand_base.c:3214/nand_scan_tail()
because the ecc.strength was not set in NAND_ECC_HW_SYNDROME ECC
mode.

Signed-off-by: Marek Vasut <[email protected]>
Cc: Benoit Thebaudeau <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Scott Wood <[email protected]>
Cc: Stefano Babic <[email protected]>
drivers/mtd/nand/mxc_nand.c

index ac435f205045e8a5f1d55643f7cdea20af98beac..40b0741f6ab23b0de80911230ef91844aae44da2 100644 (file)
@@ -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;