diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-03-21 14:01:50 +0100 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-03-29 09:38:19 +0200 |
| commit | be051bf28f8084bd75f6fd67b2f3fb7d4883751d (patch) | |
| tree | 6afa31970c7aa2a179269959494d16a64f1bbe57 /drivers/mtd/nand | |
| parent | 4e5d1d9078eda3de65f478b248cae882e2c0a839 (diff) | |
| download | op-kernel-dev-be051bf28f8084bd75f6fd67b2f3fb7d4883751d.zip op-kernel-dev-be051bf28f8084bd75f6fd67b2f3fb7d4883751d.tar.gz | |
mtd: rawnand: mxc: fix probe function error path
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>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/raw/mxc_nand.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c index 944ecf0..45786e7 100644 --- a/drivers/mtd/nand/raw/mxc_nand.c +++ b/drivers/mtd/nand/raw/mxc_nand.c @@ -1911,15 +1911,18 @@ static int mxcnd_probe(struct platform_device *pdev) goto escan; /* Register the partitions */ - mtd_device_parse_register(mtd, part_probes, - NULL, - host->pdata.parts, - host->pdata.nr_parts); + err = mtd_device_parse_register(mtd, part_probes, NULL, + host->pdata.parts, + host->pdata.nr_parts); + if (err) + goto cleanup_nand; platform_set_drvdata(pdev, host); return 0; +cleanup_nand: + nand_cleanup(this); escan: if (host->clk_act) clk_disable_unprepare(host->clk); |
