| Message ID | 1461705408-12858-1-git-send-email-zajec5@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 26 Apr 2016 23:16:47 +0200 Rafał Miłecki <zajec5@gmail.com> wrote: > Our array nand_ecc_algos doesn't specify mappings for all available > enum nand_ecc_algo values. The one missing there is NAND_ECC_UNKNOWN > as this value is reserved for algorithm not being specified at all. > It means we have to be careful when iterating this array and avoid > NULL values. > > Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Changes squashed into "mtd: nand: add support for "nand-ecc-algo" DT property". Thanks, Boris > --- > V2: Iterate from NAND_ECC_HAMMING instead of checking for NULL as preferred by > Boris. > --- > drivers/mtd/nand/nand_base.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c > index a5417a0..2e6ba44 100644 > --- a/drivers/mtd/nand/nand_base.c > +++ b/drivers/mtd/nand/nand_base.c > @@ -4015,7 +4015,7 @@ static int of_get_nand_ecc_algo(struct device_node *np) > > err = of_property_read_string(np, "nand-ecc-algo", &pm); > if (!err) { > - for (i = 0; i < ARRAY_SIZE(nand_ecc_algos); i++) > + for (i = NAND_ECC_HAMMING; i < ARRAY_SIZE(nand_ecc_algos); i++) > if (!strcasecmp(pm, nand_ecc_algos[i])) > return i; > return -ENODEV;
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index a5417a0..2e6ba44 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -4015,7 +4015,7 @@ static int of_get_nand_ecc_algo(struct device_node *np) err = of_property_read_string(np, "nand-ecc-algo", &pm); if (!err) { - for (i = 0; i < ARRAY_SIZE(nand_ecc_algos); i++) + for (i = NAND_ECC_HAMMING; i < ARRAY_SIZE(nand_ecc_algos); i++) if (!strcasecmp(pm, nand_ecc_algos[i])) return i; return -ENODEV;
Our array nand_ecc_algos doesn't specify mappings for all available enum nand_ecc_algo values. The one missing there is NAND_ECC_UNKNOWN as this value is reserved for algorithm not being specified at all. It means we have to be careful when iterating this array and avoid NULL values. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- V2: Iterate from NAND_ECC_HAMMING instead of checking for NULL as preferred by Boris. --- drivers/mtd/nand/nand_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)