forked from Minki/linux
mtd: mxc_nand: move ecc strengh setup before nand_scan_tail
Since commit 6a918bade9
, 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>
This commit is contained in:
parent
2e24e32e27
commit
4a43faf54e
@ -1465,12 +1465,6 @@ static int __init mxcnd_probe(struct platform_device *pdev)
|
||||
else if (mtd->writesize == 4096)
|
||||
this->ecc.layout = host->devtype_data->ecclayout_4k;
|
||||
|
||||
/* second phase scan */
|
||||
if (nand_scan_tail(mtd)) {
|
||||
err = -ENXIO;
|
||||
goto escan;
|
||||
}
|
||||
|
||||
if (this->ecc.mode == NAND_ECC_HW) {
|
||||
if (nfc_is_v1())
|
||||
this->ecc.strength = 1;
|
||||
@ -1478,6 +1472,12 @@ static int __init mxcnd_probe(struct platform_device *pdev)
|
||||
this->ecc.strength = (host->eccsize == 4) ? 4 : 8;
|
||||
}
|
||||
|
||||
/* second phase scan */
|
||||
if (nand_scan_tail(mtd)) {
|
||||
err = -ENXIO;
|
||||
goto escan;
|
||||
}
|
||||
|
||||
/* Register the partitions */
|
||||
mtd_device_parse_register(mtd, part_probes,
|
||||
&(struct mtd_part_parser_data){
|
||||
|
Loading…
Reference in New Issue
Block a user