aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2018-03-21 09:01:45 -0400
committerBoris Brezillon <boris.brezillon@bootlin.com>2018-03-29 03:38:19 -0400
commit4e5d1d9078eda3de65f478b248cae882e2c0a839 (patch)
treea8852cfcebf527e73cfa72638294b36709f51b9a
parent4acc3046ed5c1641874b89fe66ef8707d81ff80e (diff)
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>
-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)
1384 ret = mtd_device_register(mtd, NULL, 0); 1384 ret = mtd_device_register(mtd, NULL, 0);
1385 if (ret) { 1385 if (ret) {
1386 dev_err(denali->dev, "Failed to register MTD: %d\n", ret); 1386 dev_err(denali->dev, "Failed to register MTD: %d\n", ret);
1387 goto free_buf; 1387 goto cleanup_nand;
1388 } 1388 }
1389 return 0; 1389 return 0;
1390 1390
1391cleanup_nand:
1392 nand_cleanup(chip);
1391free_buf: 1393free_buf:
1392 kfree(denali->buf); 1394 kfree(denali->buf);
1393disable_irq: 1395disable_irq: