diff options
author | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-03-21 09:01:44 -0400 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-03-29 03:38:18 -0400 |
commit | 4acc3046ed5c1641874b89fe66ef8707d81ff80e (patch) | |
tree | 1048e51b4f3edfb13b73b35f1e399c3e101c6995 | |
parent | a446c998ff0cd49fa8023f607e9fc15ce45ec576 (diff) |
mtd: rawnand: davinci: fix probe function error path
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>
-rw-r--r-- | drivers/mtd/nand/raw/davinci_nand.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c index ccc8c43abcff..0f09518d980f 100644 --- a/drivers/mtd/nand/raw/davinci_nand.c +++ b/drivers/mtd/nand/raw/davinci_nand.c | |||
@@ -826,7 +826,7 @@ static int nand_davinci_probe(struct platform_device *pdev) | |||
826 | else | 826 | else |
827 | ret = mtd_device_register(mtd, NULL, 0); | 827 | ret = mtd_device_register(mtd, NULL, 0); |
828 | if (ret < 0) | 828 | if (ret < 0) |
829 | goto err; | 829 | goto err_cleanup_nand; |
830 | 830 | ||
831 | val = davinci_nand_readl(info, NRCSR_OFFSET); | 831 | val = davinci_nand_readl(info, NRCSR_OFFSET); |
832 | dev_info(&pdev->dev, "controller rev. %d.%d\n", | 832 | dev_info(&pdev->dev, "controller rev. %d.%d\n", |
@@ -834,6 +834,9 @@ static int nand_davinci_probe(struct platform_device *pdev) | |||
834 | 834 | ||
835 | return 0; | 835 | return 0; |
836 | 836 | ||
837 | err_cleanup_nand: | ||
838 | nand_cleanup(&info->chip); | ||
839 | |||
837 | err: | 840 | err: |
838 | clk_disable_unprepare(info->clk); | 841 | clk_disable_unprepare(info->clk); |
839 | 842 | ||