Commit 0792ec82 authored by Evgeny Novikov's avatar Evgeny Novikov Committed by Miquel Raynal
Browse files

mtd: rawnand: intel: Fix error handling in probe 



ebu_nand_probe() did not invoke ebu_dma_cleanup() and
clk_disable_unprepare() on some error handling paths. The patch fixes
that.

Found by Linux Driver Verification project (linuxtesting.org).

Fixes: 0b1039f0 ("mtd: rawnand: Add NAND controller support on Intel LGM SoC")
Signed-off-by: default avatarEvgeny Novikov <novikov@ispras.ru>
Co-developed-by: default avatarKirill Shilimanov <kirill.shilimanov@huawei.com>
Signed-off-by: default avatarKirill Shilimanov <kirill.shilimanov@huawei.com>
Co-developed-by: default avatarAnton Vasilyev <vasilyev@ispras.ru>
Signed-off-by: default avatarAnton Vasilyev <vasilyev@ispras.ru>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210817092930.23040-1-novikov@ispras.ru
parent 6f802696

drivers/mtd/nand/raw/intel-nand-controller.c

+18 −9
Original line number Diff line number Diff line
@@ -631,19 +631,26 @@ static int ebu_nand_probe(struct platform_device *pdev) 
	ebu_host->clk_rate = clk_get_rate(ebu_host->clk);



	ebu_host->dma_tx = dma_request_chan(dev, "tx");

	if (IS_ERR(ebu_host->dma_tx))

		return dev_err_probe(dev, PTR_ERR(ebu_host->dma_tx),

	if (IS_ERR(ebu_host->dma_tx)) {

		ret = dev_err_probe(dev, PTR_ERR(ebu_host->dma_tx),

				    "failed to request DMA tx chan!.\n");

		goto err_disable_unprepare_clk;

	}



	ebu_host->dma_rx = dma_request_chan(dev, "rx");

	if (IS_ERR(ebu_host->dma_rx))

		return dev_err_probe(dev, PTR_ERR(ebu_host->dma_rx),

	if (IS_ERR(ebu_host->dma_rx)) {

		ret = dev_err_probe(dev, PTR_ERR(ebu_host->dma_rx),

				    "failed to request DMA rx chan!.\n");

		ebu_host->dma_rx = NULL;

		goto err_cleanup_dma;

	}



	resname = devm_kasprintf(dev, GFP_KERNEL, "addr_sel%d", cs);

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, resname);

	if (!res)

		return -EINVAL;

	if (!res) {

		ret = -EINVAL;

		goto err_cleanup_dma;

	}

	ebu_host->cs[cs].addr_sel = res->start;

	writel(ebu_host->cs[cs].addr_sel | EBU_ADDR_MASK(5) | EBU_ADDR_SEL_REGEN,

	       ebu_host->ebu + EBU_ADDR_SEL(cs));
@@ -653,7 +660,8 @@ static int ebu_nand_probe(struct platform_device *pdev) 
	mtd = nand_to_mtd(&ebu_host->chip);

	if (!mtd->name) {

		dev_err(ebu_host->dev, "NAND label property is mandatory\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err_cleanup_dma;

	}



	mtd->dev.parent = dev;
@@ -681,6 +689,7 @@ static int ebu_nand_probe(struct platform_device *pdev) 
	nand_cleanup(&ebu_host->chip);

err_cleanup_dma:

	ebu_dma_cleanup(ebu_host);

err_disable_unprepare_clk:

	clk_disable_unprepare(ebu_host->clk);



	return ret;