[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <22c57600-a9ab-8d3b-e481-1087a6867446@microchip.com>
Date: Fri, 18 Mar 2022 12:34:29 +0000
From: <Claudiu.Beznea@...rochip.com>
To: <linmq006@...il.com>, <krzysztof.kozlowski@...onical.com>,
<Nicolas.Ferre@...rochip.com>, <alexandre.belloni@...tlin.com>,
<bbrezillon@...nel.org>, <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH] memory: atmel-ebi: Fix missing of_node_put in
atmel_ebi_probe
On 09.03.2022 13:01, Miaoqian Lin wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> The device_node pointer is returned by of_parse_phandle() with refcount
> incremented. We should use of_node_put() on it when done.
>
> Fixes: 87108dc78eb8 ("memory: atmel-ebi: Enable the SMC clock if specified")
> Signed-off-by: Miaoqian Lin <linmq006@...il.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@...rochip.com>
> ---
> drivers/memory/atmel-ebi.c | 23 +++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
> index c267283b01fd..e749dcb3ddea 100644
> --- a/drivers/memory/atmel-ebi.c
> +++ b/drivers/memory/atmel-ebi.c
> @@ -544,20 +544,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;
> @@ -608,6 +615,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)
> --
> 2.17.1
>
Powered by blists - more mailing lists