| From 0dff1339416d798a6f80fdadeeb2ab4971e5ea66 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 19 May 2020 15:00:06 +0200 |
| Subject: mtd: rawnand: orion: Fix the probe error path |
| |
| From: Miquel Raynal <miquel.raynal@bootlin.com> |
| |
| [ Upstream commit be238fbf78e4c7c586dac235ab967d3e565a4d1a ] |
| |
| nand_release() is supposed be called after MTD device registration. |
| Here, only nand_scan() happened, so use nand_cleanup() instead. |
| |
| There is no real Fixes tag applying here as the use of nand_release() |
| in this driver predates by far the introduction of nand_cleanup() in |
| commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") |
| which makes this change possible. However, pointing this commit as the |
| culprit for backporting purposes makes sense even if this commit is not |
| introducing any bug. |
| |
| Fixes: d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") |
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Cc: stable@vger.kernel.org |
| Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-34-miquel.raynal@bootlin.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mtd/nand/orion_nand.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c |
| index 2f21c678d6efd..df07f9b4cf03a 100644 |
| --- a/drivers/mtd/nand/orion_nand.c |
| +++ b/drivers/mtd/nand/orion_nand.c |
| @@ -186,7 +186,7 @@ static int __init orion_nand_probe(struct platform_device *pdev) |
| mtd->name = "orion_nand"; |
| ret = mtd_device_register(mtd, board->parts, board->nr_parts); |
| if (ret) { |
| - nand_release(nc); |
| + nand_cleanup(nc); |
| goto no_dev; |
| } |
| |
| -- |
| 2.25.1 |
| |
