From: Miquel Raynal <miquel.ray...@bootlin.com>

commit b60391eb17b2956ff2fc4c348e5a464da21ff9cb upstream.

On error, the oxnas probe path just frees the device which failed and
aborts the probe, leaving unreleased resources.

Fix this situation by calling mtd_device_unregister()/nand_cleanup()
on these.

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

---
 drivers/mtd/nand/raw/oxnas_nand.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- a/drivers/mtd/nand/raw/oxnas_nand.c
+++ b/drivers/mtd/nand/raw/oxnas_nand.c
@@ -89,6 +89,7 @@ static int oxnas_nand_probe(struct platf
        struct resource *res;
        int count = 0;
        int err = 0;
+       int i;
 
        /* Allocate memory for the device structure (and zero it) */
        oxnas = devm_kzalloc(&pdev->dev, sizeof(*oxnas),
@@ -168,6 +169,13 @@ err_cleanup_nand:
        nand_cleanup(chip);
 err_release_child:
        of_node_put(nand_np);
+
+       for (i = 0; i < oxnas->nchips; i++) {
+               chip = oxnas->chips[i];
+               WARN_ON(mtd_device_unregister(nand_to_mtd(chip)));
+               nand_cleanup(chip);
+       }
+
 err_clk_unprepare:
        clk_disable_unprepare(oxnas->clk);
        return err;


Reply via email to