Skip to content

Commit f49bde9

Browse files
committed
mtd: rawnand: mpc5121: Do not force a particular software ECC engine
Originally, commit d7157ff ("mtd: rawnand: Use the ECC framework user input parsing bits") kind of broke the logic around the initialization of several ECC engines. Unfortunately, the fix (which indeed moved the ECC initialization to the right place) did not take into account the fact that a different ECC algorithm could have been used thanks to a DT property, considering the "Hamming" algorithm entry a configuration while it was only a default. Add the necessary logic to be sure Hamming keeps being only a default. Fixes: 6dd09f7 ("mtd: rawnand: mpc5121: Move the ECC initialization to ->attach_chip()") Signed-off-by: Miquel Raynal <[email protected]> Link: https://lore.kernel.org/linux-mtd/[email protected]
1 parent bd47fa4 commit f49bde9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/mtd/nand/raw/mpc5121_nfc.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,9 @@ static void mpc5121_nfc_free(struct device *dev, struct mtd_info *mtd)
606606
static int mpc5121_nfc_attach_chip(struct nand_chip *chip)
607607
{
608608
chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
609-
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
609+
610+
if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
611+
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
610612

611613
return 0;
612614
}

0 commit comments

Comments
 (0)