From: Miquel Raynal <miquel.raynal@bootlin.com>
Date: Wed, 25 Jul 2018 13:31:44 +0000 (+0200)
Subject: mtd: rawnand: jz4740: fix probe function error path
X-Git-Tag: v4.19-rc1~171^2~2^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f57bbfb9e3f47b6d4eecb1d8037dab1cda9996a4;p=thirdparty%2Fkernel%2Flinux.git

mtd: rawnand: jz4740: fix probe function error path

An error after nand_scan_tail() should trigger a nand_cleanup(), not a
nand_release() as mtd_device_register() (or one of its variants) has not
been called and there is no need to deregister any MTD device yet.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>
---

diff --git a/drivers/mtd/nand/raw/jz4740_nand.c b/drivers/mtd/nand/raw/jz4740_nand.c
index a4052b03249c7..3abf87420c10d 100644
--- a/drivers/mtd/nand/raw/jz4740_nand.c
+++ b/drivers/mtd/nand/raw/jz4740_nand.c
@@ -472,15 +472,15 @@ static int jz_nand_probe(struct platform_device *pdev)
 
 	if (ret) {
 		dev_err(&pdev->dev, "Failed to add mtd device\n");
-		goto err_nand_release;
+		goto err_cleanup_nand;
 	}
 
 	dev_info(&pdev->dev, "Successfully registered JZ4740 NAND driver\n");
 
 	return 0;
 
-err_nand_release:
-	nand_release(mtd);
+err_cleanup_nand:
+	nand_cleanup(chip);
 err_unclaim_banks:
 	while (chipnr--) {
 		unsigned char bank = nand->banks[chipnr];