Commit 1f3b494d authored by Yang Yingliang's avatar Yang Yingliang Committed by Miquel Raynal
Browse files

mtd: rawnand: intel: Add missing of_node_put() in ebu_nand_probe() 



The 'chip_np' returned by of_get_next_child() with refcount decremented,
of_node_put() need be called in error path to decrease the refcount.

Fixes: bfc618fc ("mtd: rawnand: intel: Read the chip-select line from the correct OF node")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220924131010.957117-1-yangyingliang@huawei.com
parent 12b58961

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

+15 −8
Original line number Diff line number Diff line
@@ -608,11 +608,12 @@ static int ebu_nand_probe(struct platform_device *pdev) 
	ret = of_property_read_u32(chip_np, "reg", &cs);

	if (ret) {

		dev_err(dev, "failed to get chip select: %d\n", ret);

		return ret;

		goto err_of_node_put;

	}

	if (cs >= MAX_CS) {

		dev_err(dev, "got invalid chip select: %d\n", cs);

		return -EINVAL;

		ret = -EINVAL;

		goto err_of_node_put;

	}



	ebu_host->cs_num = cs;
@@ -620,18 +621,22 @@ static int ebu_nand_probe(struct platform_device *pdev) 
	resname = devm_kasprintf(dev, GFP_KERNEL, "nand_cs%d", cs);

	ebu_host->cs[cs].chipaddr = devm_platform_ioremap_resource_byname(pdev,

									  resname);

	if (IS_ERR(ebu_host->cs[cs].chipaddr))

		return PTR_ERR(ebu_host->cs[cs].chipaddr);

	if (IS_ERR(ebu_host->cs[cs].chipaddr)) {

		ret = PTR_ERR(ebu_host->cs[cs].chipaddr);

		goto err_of_node_put;

	}



	ebu_host->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(ebu_host->clk))

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

	if (IS_ERR(ebu_host->clk)) {

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

				    "failed to get clock\n");

		goto err_of_node_put;

	}



	ret = clk_prepare_enable(ebu_host->clk);

	if (ret) {

		dev_err(dev, "failed to enable clock: %d\n", ret);

		return ret;

		goto err_of_node_put;

	}



	ebu_host->dma_tx = dma_request_chan(dev, "tx");
@@ -695,6 +700,8 @@ static int ebu_nand_probe(struct platform_device *pdev) 
	ebu_dma_cleanup(ebu_host);

err_disable_unprepare_clk:

	clk_disable_unprepare(ebu_host->clk);

err_of_node_put:

	of_node_put(chip_np);



	return ret;

}