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

index ccc8c43..0f09518 100644 (file)
@@ -826,7 +826,7 @@ static int nand_davinci_probe(struct platform_device *pdev)
        else
                ret = mtd_device_register(mtd, NULL, 0);
        if (ret < 0)
-               goto err;
+               goto err_cleanup_nand;
 
        val = davinci_nand_readl(info, NRCSR_OFFSET);
        dev_info(&pdev->dev, "controller rev. %d.%d\n",
@@ -834,6 +834,9 @@ static int nand_davinci_probe(struct platform_device *pdev)
 
        return 0;
 
+err_cleanup_nand:
+       nand_cleanup(&info->chip);
+
 err:
        clk_disable_unprepare(info->clk);