mtd: rawnand: cadence: fix the calculation of the avaialble OOB size

The value of cdns_chip->sector_count is not known at the moment
of the derivation of ecc_size, leading to a zero value. Fix
this by assigning ecc_size later in the code.

Fixes: ec4ba01e894d ("mtd: rawnand: Add new Cadence NAND driver to MTD subsystem")
Cc: stable@vger.kernel.org
Signed-off-by: Piotr Sroka <piotrs@cadence.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/1581328530-29966-2-git-send-email-piotrs@cadence.com

diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
index 5063a8b493a47f91bfe6d5d090cfae1c80e94921..2ebfd0934739f31f4e5c3c54995d32b66c764e4a 100644 (file)
--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
+++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
@@ -2595,7 +2595,7 @@ int cadence_nand_attach_chip(struct nand_chip *chip)
 {
        struct cdns_nand_ctrl *cdns_ctrl = to_cdns_nand_ctrl(chip->controller);
        struct cdns_nand_chip *cdns_chip = to_cdns_nand_chip(chip);
-       u32 ecc_size = cdns_chip->sector_count * chip->ecc.bytes;
+       u32 ecc_size;
        struct mtd_info *mtd = nand_to_mtd(chip);
        int ret;
 
@@ -2634,6 +2634,7 @@ int cadence_nand_attach_chip(struct nand_chip *chip)
        /* Error correction configuration. */
        cdns_chip->sector_size = chip->ecc.size;
        cdns_chip->sector_count = mtd->writesize / cdns_chip->sector_size;
+       ecc_size = cdns_chip->sector_count * chip->ecc.bytes;
 
        cdns_chip->avail_oob_size = mtd->oobsize - ecc_size;