]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mtd: rawnand: sh_flctl: fix the probe function error path
authorMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 21 Mar 2018 13:01:52 +0000 (14:01 +0100)
committerBoris Brezillon <boris.brezillon@bootlin.com>
Thu, 29 Mar 2018 07:38:20 +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/sh_flctl.c

index 7a740d58386618c2645aa10187efb0aac477a091..c7abceffcc405f719a100fb6b27432332ae2e696 100644 (file)
@@ -1214,9 +1214,13 @@ static int flctl_probe(struct platform_device *pdev)
                goto err_chip;
 
        ret = mtd_device_register(flctl_mtd, pdata->parts, pdata->nr_parts);
+       if (ret)
+               goto cleanup_nand;
 
        return 0;
 
+cleanup_nand:
+       nand_cleanup(nand);
 err_chip:
        flctl_release_dma(flctl);
        pm_runtime_disable(&pdev->dev);