mtd: rawnand: mxc: fix probe function error path
authorMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 21 Mar 2018 13:01:50 +0000 (14:01 +0100)
committerBoris Brezillon <boris.brezillon@bootlin.com>
Thu, 29 Mar 2018 07:38:19 +0000 (09:38 +0200)
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>
drivers/mtd/nand/raw/mxc_nand.c

index 944ecf0..45786e7 100644 (file)
@@ -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);