Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc043752 authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Greg Kroah-Hartman
Browse files

memory: atmel-ebi: Fix missing of_node_put in atmel_ebi_probe 



[ Upstream commit 6f296a9665ba5ac68937bf11f96214eb9de81baa ]

The device_node pointer is returned by of_parse_phandle() with refcount
incremented. We should use of_node_put() on it when done.

Fixes: 87108dc7 ("memory: atmel-ebi: Enable the SMC clock if specified")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220309110144.22412-1-linmq006@gmail.com


Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent aaad8e56

drivers/memory/atmel-ebi.c

+17 −6
Original line number Diff line number Diff line
@@ -524,20 +524,27 @@ static int atmel_ebi_probe(struct platform_device *pdev) 
	smc_np = of_parse_phandle(dev->of_node, "atmel,smc", 0);



	ebi->smc.regmap = syscon_node_to_regmap(smc_np);

	if (IS_ERR(ebi->smc.regmap))

		return PTR_ERR(ebi->smc.regmap);

	if (IS_ERR(ebi->smc.regmap)) {

		ret = PTR_ERR(ebi->smc.regmap);

		goto put_node;

	}



	ebi->smc.layout = atmel_hsmc_get_reg_layout(smc_np);

	if (IS_ERR(ebi->smc.layout))

		return PTR_ERR(ebi->smc.layout);

	if (IS_ERR(ebi->smc.layout)) {

		ret = PTR_ERR(ebi->smc.layout);

		goto put_node;

	}



	ebi->smc.clk = of_clk_get(smc_np, 0);

	if (IS_ERR(ebi->smc.clk)) {

		if (PTR_ERR(ebi->smc.clk) != -ENOENT)

			return PTR_ERR(ebi->smc.clk);

		if (PTR_ERR(ebi->smc.clk) != -ENOENT) {

			ret = PTR_ERR(ebi->smc.clk);

			goto put_node;

		}



		ebi->smc.clk = NULL;

	}

	of_node_put(smc_np);

	ret = clk_prepare_enable(ebi->smc.clk);

	if (ret)

		return ret;
@@ -587,6 +594,10 @@ static int atmel_ebi_probe(struct platform_device *pdev) 
	}



	return of_platform_populate(np, NULL, NULL, dev);



put_node:

	of_node_put(smc_np);

	return ret;

}



static __maybe_unused int atmel_ebi_resume(struct device *dev)