mtd: rawnand: oxnas: Keep track of registered devices

commit 383fc3f613e7eac9f2e3c13b6f9fb8c1f39cb9d5 upstream.

All initialized and registered devices should be listed somewhere so
that we can unregister/free them in the _remove() path.

This patch is not a fix per-se but is needed to apply three other
fixes coming right after, explaining the Fixes/Cc: stable tags.

Fixes: 668592492409 ("mtd: nand: Add OX820 NAND Support")
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-36-miquel.raynal@bootlin.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
index 350d4226b436aa7826c5bf649f7238834fdfdd2f..f0c2741124ce5d43f973924b2e106e96d91e019f 100644 (file)
--- a/drivers/mtd/nand/oxnas_nand.c
+++ b/drivers/mtd/nand/oxnas_nand.c
@@ -36,6 +36,7 @@ struct oxnas_nand_ctrl {
        void __iomem *io_base;
        struct clk *clk;
        struct nand_chip *chips[OXNAS_NAND_MAX_CHIPS];
+       unsigned int nchips;
 };
 
 static uint8_t oxnas_nand_read_byte(struct mtd_info *mtd)
@@ -86,7 +87,6 @@ static int oxnas_nand_probe(struct platform_device *pdev)
        struct nand_chip *chip;
        struct mtd_info *mtd;
        struct resource *res;
-       int nchips = 0;
        int count = 0;
        int err = 0;
 
@@ -150,12 +150,12 @@ static int oxnas_nand_probe(struct platform_device *pdev)
                if (err)
                        goto err_cleanup_nand;
 
-               oxnas->chips[nchips] = chip;
-               ++nchips;
+               oxnas->chips[oxnas->nchips] = chip;
+               ++oxnas->nchips;
        }
 
        /* Exit if no chips found */
-       if (!nchips) {
+       if (!oxnas->nchips) {
                err = -ENODEV;
                goto err_clk_unprepare;
        }