Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 05:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd: rawnand: davinci: fix probe function error path

Browse Source 
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: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
This commit is contained in:
Miquel Raynal 2018-03-21 14:01:44 +01:00 committed by Boris Brezillon
parent a446c998ff
commit 4acc3046ed
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mtd/nand/raw/davinci_nand.c
View File

@ -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)
return 0; return 0;
err_cleanup_nand:
nand_cleanup(&info->chip);
err: err:
clk_disable_unprepare(info->clk); clk_disable_unprepare(info->clk);