Skip to content

Commit bd47fa4

Browse files
committed
mtd: rawnand: gpio: 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: f6341f6 ("mtd: rawnand: gpio: 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 5227726 commit bd47fa4

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/mtd/nand/raw/gpio.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,9 @@ static int gpio_nand_exec_op(struct nand_chip *chip,
164164
static int gpio_nand_attach_chip(struct nand_chip *chip)
165165
{
166166
chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
167-
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
167+
168+
if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
169+
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
168170

169171
return 0;
170172
}

0 commit comments

Comments
 (0)