Skip to content

Commit cf75f00

Browse files
committed
mtd: rawnand: socrates: 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: b36bf0a ("mtd: rawnand: socrates: 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 148b4f1 commit cf75f00

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/mtd/nand/raw/socrates_nand.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ static int socrates_nand_device_ready(struct nand_chip *nand_chip)
120120
static int socrates_attach_chip(struct nand_chip *chip)
121121
{
122122
chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
123-
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
123+
124+
if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
125+
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
124126

125127
return 0;
126128
}

0 commit comments

Comments
 (0)