lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memory: atmel-ebi: Fix missing of_node_put in atmel_ebi_probe

Browse Source 
[ 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: 87108dc78e ("memory: atmel-ebi: Enable the SMC clock if specified")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220309110144.22412-1-linmq006@gmail.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Miaoqian Lin 2022-03-09 11:01:43 +00:00 committed by Greg Kroah-Hartman
parent e7f5213d75
commit 9250186785
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/memory/atmel-ebi.c
View File

@ -545,20 +545,27 @@ static int atmel_ebi_probe(struct platform_device *pdev)
smc_np = of_parse_phandle(dev->of_node, "atmel,smc", 0); smc_np = of_parse_phandle(dev->of_node, "atmel,smc", 0);
ebi->smc.regmap = syscon_node_to_regmap(smc_np); ebi->smc.regmap = syscon_node_to_regmap(smc_np);
if (IS_ERR(ebi->smc.regmap)) if (IS_ERR(ebi->smc.regmap)) {
return PTR_ERR(ebi->smc.regmap); ret = PTR_ERR(ebi->smc.regmap);
goto put_node;
}
ebi->smc.layout = atmel_hsmc_get_reg_layout(smc_np); ebi->smc.layout = atmel_hsmc_get_reg_layout(smc_np);
if (IS_ERR(ebi->smc.layout)) if (IS_ERR(ebi->smc.layout)) {
return PTR_ERR(ebi->smc.layout); ret = PTR_ERR(ebi->smc.layout);
goto put_node;
}
ebi->smc.clk = of_clk_get(smc_np, 0); ebi->smc.clk = of_clk_get(smc_np, 0);
if (IS_ERR(ebi->smc.clk)) { if (IS_ERR(ebi->smc.clk)) {
if (PTR_ERR(ebi->smc.clk) != -ENOENT) if (PTR_ERR(ebi->smc.clk) != -ENOENT) {
return PTR_ERR(ebi->smc.clk); ret = PTR_ERR(ebi->smc.clk);
goto put_node;
}
ebi->smc.clk = NULL; ebi->smc.clk = NULL;
} }
of_node_put(smc_np);
ret = clk_prepare_enable(ebi->smc.clk); ret = clk_prepare_enable(ebi->smc.clk);
if (ret) if (ret)
return ret; return ret;
@ -609,6 +616,10 @@ static int atmel_ebi_probe(struct platform_device *pdev)
} }
return of_platform_populate(np, NULL, NULL, dev); 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) static __maybe_unused int atmel_ebi_resume(struct device *dev)