From: Miquel Raynal <miquel.raynal@bootlin.com>
Date: Sat, 21 Apr 2018 18:00:41 +0000 (+0200)
Subject: mtd: rawnand: lpc32xx_mlc: fix the probe function error path
X-Git-Tag: v4.18-rc1~90^2~1^2~16
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=838c07b05b369b3ee6bb18cdc1aec1241a1ef951;p=linux.git

mtd: rawnand: lpc32xx_mlc: 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/lpc32xx_mlc.c b/drivers/mtd/nand/raw/lpc32xx_mlc.c
index 6e31faf2f07f..052d123a8304 100644
--- a/drivers/mtd/nand/raw/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_mlc.c
@@ -806,12 +806,12 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
 	res = mtd_device_register(mtd, host->ncfg->parts,
 				  host->ncfg->num_parts);
 	if (res)
-		goto release_nand;
+		goto cleanup_nand;
 
 	return 0;
 
-release_nand:
-	nand_release(mtd);
+cleanup_nand:
+	nand_cleanup(nand_chip);
 free_irq:
 	free_irq(host->irq, host);
 release_dma_chan: