diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2020-05-19 15:00:08 +0200 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2020-05-31 10:53:35 +0200 |
| commit | 383fc3f613e7eac9f2e3c13b6f9fb8c1f39cb9d5 (patch) | |
| tree | e3bc8aab13ec2b1594d5385aafeda560c1000a63 | |
| parent | f342df67b19a4545ee742301594ad1e9b6e5aa91 (diff) | |
| download | linux-383fc3f613e7eac9f2e3c13b6f9fb8c1f39cb9d5.tar.bz2 | |
mtd: rawnand: oxnas: Keep track of registered devices
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
| -rw-r--r-- | drivers/mtd/nand/raw/oxnas_nand.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/raw/oxnas_nand.c b/drivers/mtd/nand/raw/oxnas_nand.c index c43cb4d92d3d..bead5ac70160 100644 --- a/drivers/mtd/nand/raw/oxnas_nand.c +++ b/drivers/mtd/nand/raw/oxnas_nand.c @@ -32,6 +32,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 nand_chip *chip) @@ -79,7 +80,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; @@ -145,12 +145,12 @@ static int oxnas_nand_probe(struct platform_device *pdev) goto err_release_child; } - 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; } |