提交 4acc3046 编写于 作者: M Miquel Raynal 提交者: Boris Brezillon

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: NMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: NBoris Brezillon <boris.brezillon@bootlin.com>
上级 a446c998
...@@ -826,7 +826,7 @@ static int nand_davinci_probe(struct platform_device *pdev) ...@@ -826,7 +826,7 @@ static int nand_davinci_probe(struct platform_device *pdev)
else else
ret = mtd_device_register(mtd, NULL, 0); ret = mtd_device_register(mtd, NULL, 0);
if (ret < 0) if (ret < 0)
goto err; goto err_cleanup_nand;
val = davinci_nand_readl(info, NRCSR_OFFSET); val = davinci_nand_readl(info, NRCSR_OFFSET);
dev_info(&pdev->dev, "controller rev. %d.%d\n", dev_info(&pdev->dev, "controller rev. %d.%d\n",
...@@ -834,6 +834,9 @@ static int nand_davinci_probe(struct platform_device *pdev) ...@@ -834,6 +834,9 @@ static int nand_davinci_probe(struct platform_device *pdev)
return 0; return 0;
err_cleanup_nand:
nand_cleanup(&info->chip);
err: err:
clk_disable_unprepare(info->clk); clk_disable_unprepare(info->clk);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册