From: Miquel Raynal <miquel.raynal@bootlin.com>
Date: Sat, 21 Apr 2018 18:00:39 +0000 (+0200)
Subject: mtd: rawnand: hisi504: fix the probe function error path
X-Git-Tag: rel_imx_4.19.35_1.1.0~9946^2~1^2~18
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=6f533c463105472b71587b9bf8532f34f9d60deb;p=linux.git

mtd: rawnand: hisi504: fix the probe function error path

An error after nand_scan_tail() should trigger a nand_cleanup() and not
a nand_release(). The latter doing an mtd_device_unregister() which is
not needed if mtd_device_register() failed.

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

diff --git a/drivers/mtd/nand/raw/hisi504_nand.c b/drivers/mtd/nand/raw/hisi504_nand.c
index 3c64a6281b54..a1e009c8e556 100644
--- a/drivers/mtd/nand/raw/hisi504_nand.c
+++ b/drivers/mtd/nand/raw/hisi504_nand.c
@@ -808,7 +808,7 @@ static int hisi_nfc_probe(struct platform_device *pdev)
 	ret = mtd_device_register(mtd, NULL, 0);
 	if (ret) {
 		dev_err(dev, "Err MTD partition=%d\n", ret);
-		nand_release(mtd);
+		nand_cleanup(chip);
 		return ret;
 	}