mtd: rawnand: oxnas: Keep track of registered devices
commit5.4-rM2-2.2.x-imx-squashed383fc3f613
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:6685924924
("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>
parent
8463054e3d
commit
4682749ce3
|
@ -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;
|
||||
|
||||
|
@ -143,12 +143,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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue