2021-12-13 09:46:41

by 王擎

Subject: [PATCH] arm: mach-at91: add missing of_node_put

From: Wang Qing <[email protected]>

Fix following coccicheck warning:
WARNING: Function "for_each_matching_node_and_match"
should have of_node_put() before return.

Early exits from for_each_matching_node_and_match should decrement the
node reference counter.

Signed-off-by: Wang Qing <[email protected]>
---
arch/arm/mach-at91/pm.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 8711d68..ca313fe
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -644,6 +644,7 @@ static __init int at91_dt_ramc(bool phy_mandatory)
soc_pm.data.ramc[idx] = of_iomap(np, 0);
if (!soc_pm.data.ramc[idx]) {
pr_err("unable to map ramc[%d] cpu registers\n", idx);
+ of_node_put(np);
ret = -ENOMEM;
goto unmap_ramc;
}
@@ -669,6 +670,7 @@ static __init int at91_dt_ramc(bool phy_mandatory)
soc_pm.data.ramc_phy = of_iomap(np, 0);
if (!soc_pm.data.ramc_phy) {
pr_err("unable to map ramc phy cpu registers\n");
+ of_node_put(np);
ret = -ENOMEM;
goto unmap_ramc;
}
--
2.7.4

2021-12-13 13:34:54

by Nicolas Ferre

Subject: Re: [PATCH] arm: mach-at91: add missing of_node_put

On 13/12/2021 at 10:41, Qing Wang wrote:
> From: Wang Qing <[email protected]>
>
> Fix following coccicheck warning:
> WARNING: Function "for_each_matching_node_and_match"
> should have of_node_put() before return.
>
> Early exits from for_each_matching_node_and_match should decrement the
> node reference counter.
>
> Signed-off-by: Wang Qing <[email protected]>

Wang,

What's the difference between this patch and the one accepted here:
https://lore.kernel.org/all/[email protected]/

Regards,
Nicolas

> ---
> arch/arm/mach-at91/pm.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 8711d68..ca313fe
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -644,6 +644,7 @@ static __init int at91_dt_ramc(bool phy_mandatory)
> soc_pm.data.ramc[idx] = of_iomap(np, 0);
> if (!soc_pm.data.ramc[idx]) {
> pr_err("unable to map ramc[%d] cpu registers\n", idx);
> + of_node_put(np);
> ret = -ENOMEM;
> goto unmap_ramc;
> }
> @@ -669,6 +670,7 @@ static __init int at91_dt_ramc(bool phy_mandatory)
> soc_pm.data.ramc_phy = of_iomap(np, 0);
> if (!soc_pm.data.ramc_phy) {
> pr_err("unable to map ramc phy cpu registers\n");
> + of_node_put(np);
> ret = -ENOMEM;
> goto unmap_ramc;
> }
> --
> 2.7.4
>


--
Nicolas Ferre