diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-25 10:22:42 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-06-01 15:23:29 -0400 |
commit | 4a43faf54e9173b6acce37cf7f053fc9515a2cdf (patch) | |
tree | 37af143a476ffc67d08a6a15f785483fa7d0f19f /drivers/mtd/nand | |
parent | 2e24e32e2759348c9290404abad4f729f791bfad (diff) |
mtd: mxc_nand: move ecc strengh setup before nand_scan_tail
Since commit 6a918bade9dab40aaef80559bd1169c69e8d69cb, the mxc_nand driver
fails with:
Driver must set ecc.strength when using hardware ECC
This is because nand_scan_tail checks for correct ecc strength
settings, so we must set them up before nand_scan_tail.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: stable@vger.kernel.org [3.4+]
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index ec5ba8bac73e..3310a48000d1 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c | |||
@@ -1465,12 +1465,6 @@ static int __init mxcnd_probe(struct platform_device *pdev) | |||
1465 | else if (mtd->writesize == 4096) | 1465 | else if (mtd->writesize == 4096) |
1466 | this->ecc.layout = host->devtype_data->ecclayout_4k; | 1466 | this->ecc.layout = host->devtype_data->ecclayout_4k; |
1467 | 1467 | ||
1468 | /* second phase scan */ | ||
1469 | if (nand_scan_tail(mtd)) { | ||
1470 | err = -ENXIO; | ||
1471 | goto escan; | ||
1472 | } | ||
1473 | |||
1474 | if (this->ecc.mode == NAND_ECC_HW) { | 1468 | if (this->ecc.mode == NAND_ECC_HW) { |
1475 | if (nfc_is_v1()) | 1469 | if (nfc_is_v1()) |
1476 | this->ecc.strength = 1; | 1470 | this->ecc.strength = 1; |
@@ -1478,6 +1472,12 @@ static int __init mxcnd_probe(struct platform_device *pdev) | |||
1478 | this->ecc.strength = (host->eccsize == 4) ? 4 : 8; | 1472 | this->ecc.strength = (host->eccsize == 4) ? 4 : 8; |
1479 | } | 1473 | } |
1480 | 1474 | ||
1475 | /* second phase scan */ | ||
1476 | if (nand_scan_tail(mtd)) { | ||
1477 | err = -ENXIO; | ||
1478 | goto escan; | ||
1479 | } | ||
1480 | |||
1481 | /* Register the partitions */ | 1481 | /* Register the partitions */ |
1482 | mtd_device_parse_register(mtd, part_probes, | 1482 | mtd_device_parse_register(mtd, part_probes, |
1483 | &(struct mtd_part_parser_data){ | 1483 | &(struct mtd_part_parser_data){ |