summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2018-03-21 14:01:45 +0100
committerBoris Brezillon <boris.brezillon@bootlin.com>2018-03-29 09:38:19 +0200
commit4e5d1d9078eda3de65f478b248cae882e2c0a839 (patch)
treea8852cfcebf527e73cfa72638294b36709f51b9a /drivers
parentmtd: rawnand: davinci: fix probe function error path (diff)
downloadlinux-4e5d1d9078eda3de65f478b248cae882e2c0a839.tar.xz
linux-4e5d1d9078eda3de65f478b248cae882e2c0a839.zip
mtd: rawnand: denali: 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/raw/denali.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index 313c7f50621b..2a302a1d1430 100644
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -1384,10 +1384,12 @@ int denali_init(struct denali_nand_info *denali)
ret = mtd_device_register(mtd, NULL, 0);
if (ret) {
dev_err(denali->dev, "Failed to register MTD: %d\n", ret);
- goto free_buf;
+ goto cleanup_nand;
}
return 0;
+cleanup_nand:
+ nand_cleanup(chip);
free_buf:
kfree(denali->buf);
disable_irq: