Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 16:29:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mtd: rawnand: mxc: fix probe function error path

Browse Source 
An error after nand_scan_tail() should trigger a nand_cleanup().
The helper mtd_device_parse_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:50 +01:00 committed by Boris Brezillon
parent 4e5d1d9078
commit be051bf28f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mtd/nand/raw/mxc_nand.c
View File

@ -1911,15 +1911,18 @@ static int mxcnd_probe(struct platform_device *pdev)
goto escan; goto escan;
/* Register the partitions */ /* Register the partitions */
mtd_device_parse_register(mtd, part_probes, err = mtd_device_parse_register(mtd, part_probes, NULL,
NULL, host->pdata.parts,
host->pdata.parts, host->pdata.nr_parts);
host->pdata.nr_parts); if (err)
goto cleanup_nand;
platform_set_drvdata(pdev, host); platform_set_drvdata(pdev, host);
return 0; return 0;
cleanup_nand:
nand_cleanup(this);
escan: escan:
if (host->clk_act) if (host->clk_act)
clk_disable_unprepare(host->clk); clk_disable_unprepare(host->clk);