Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4acc3046 authored by Miquel Raynal's avatar Miquel Raynal Committed by Boris Brezillon
Browse files

mtd: rawnand: davinci: fix probe function error path 



An error after nand_scan_tail() should trigger a nand_cleanup().
The helper mtd_device_register() returns an error code that should
be checked and nand_cleanup() called accordingly.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent a446c998

drivers/mtd/nand/raw/davinci_nand.c

+4 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ static int nand_davinci_probe(struct platform_device *pdev) 
	else

		ret = mtd_device_register(mtd, NULL, 0);

	if (ret < 0)

		goto err;

		goto err_cleanup_nand;



	val = davinci_nand_readl(info, NRCSR_OFFSET);

	dev_info(&pdev->dev, "controller rev. %d.%d\n",
@@ -834,6 +834,9 @@ static int nand_davinci_probe(struct platform_device *pdev) 


	return 0;



err_cleanup_nand:

	nand_cleanup(&info->chip);



err:

	clk_disable_unprepare(info->clk);