diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-03-21 14:01:51 +0100 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-03-29 09:38:20 +0200 |
| commit | 122bb3cb8b009aaa19fd8b09df8028ba8d49c043 (patch) | |
| tree | c15c3fca83260719c3cadbee9bc90b8b3b3d2eed /drivers/mtd | |
| parent | be051bf28f8084bd75f6fd67b2f3fb7d4883751d (diff) | |
| download | linux-122bb3cb8b009aaa19fd8b09df8028ba8d49c043.tar.gz linux-122bb3cb8b009aaa19fd8b09df8028ba8d49c043.tar.xz | |
mtd: rawnand: omap2: fix the probe function error path
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>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/raw/omap2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/omap2.c b/drivers/mtd/nand/raw/omap2.c index 8cdf7d3d8fa7..e50c64adc3c8 100644 --- a/drivers/mtd/nand/raw/omap2.c +++ b/drivers/mtd/nand/raw/omap2.c @@ -2263,12 +2263,15 @@ scan_tail: err = mtd_device_register(mtd, NULL, 0); if (err) - goto return_error; + goto cleanup_nand; platform_set_drvdata(pdev, mtd); return 0; +cleanup_nand: + nand_cleanup(nand_chip); + return_error: if (!IS_ERR_OR_NULL(info->dma)) dma_release_channel(info->dma); |