mtd: rawnand: oxnas: Fix the probe error path

[ Upstream commit 154298e2a3f6c9ce1d76cdb48d89fd5b107ea1a3 ]

nand_release() is supposed be called after MTD device registration.
Here, only nand_scan() happened, so use nand_cleanup() instead.

While at it, be consistent and move the function call in the error
path thanks to a goto statement.

Fixes: 668592492409 ("mtd: nand: Add OX820 NAND Support")
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-37-miquel.raynal@bootlin.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
index 7f0ba28f8a00752c232feb29504ccce3b585546c..350d4226b436aa7826c5bf649f7238834fdfdd2f 100644 (file)
--- a/drivers/mtd/nand/oxnas_nand.c
+++ b/drivers/mtd/nand/oxnas_nand.c
@@ -147,10 +147,8 @@ static int oxnas_nand_probe(struct platform_device *pdev)
                        goto err_release_child;
 
                err = mtd_device_register(mtd, NULL, 0);
-               if (err) {
-                       nand_release(chip);
-                       goto err_release_child;
-               }
+               if (err)
+                       goto err_cleanup_nand;
 
                oxnas->chips[nchips] = chip;
                ++nchips;
@@ -166,6 +164,8 @@ static int oxnas_nand_probe(struct platform_device *pdev)
 
        return 0;
 
+err_cleanup_nand:
+       nand_cleanup(chip);
 err_release_child:
        of_node_put(nand_np);
 err_clk_unprepare: