1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 74a43b818d0e..cc0678a967c1 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1225,9 +1225,16 @@ static int __init mxcnd_probe(struct platform_device *pdev)
                 goto escan;
         }
 
+        if (this->ecc.mode == NAND_ECC_HW) {
+                if (nfc_is_v1())
+                        this->ecc.strength = 1;
+                else
+                        this->ecc.strength = (host->eccsize == 4) ? 4 : 8;
+        }
+
         /* Register the partitions */
-        mtd_device_parse_register(mtd, part_probes, 0,
-                        pdata->parts, pdata->nr_parts);
+        mtd_device_parse_register(mtd, part_probes, NULL, pdata->parts,
+                                  pdata->nr_parts);
 
         platform_set_drvdata(pdev, host);