Re: [PATCH] ARM: EXYNOS: Fix double of_node_put() when parsing child power domains

2015-10-12 Thread Kukjin Kim
On 10/12/15 10:26, Krzysztof Kozlowski wrote:
> On each next iteration of for_each_compatible_node() the reference
> counter for current device node is already decreased by the loop
> iterator. The manual call to of_node_get() is required only on loop
> break which is not happening here.
> 
> The double of_node_get() (with enabled CONFIG_OF_DYNAMIC) lead to
> decreasing the counter below expected, initial value.
> 
> Signed-off-by: Krzysztof Kozlowski 
> Fixes: fe4034a3fad7 ("ARM: EXYNOS: Add missing of_node_put() when parsing 
> power domains")
> ---
>  arch/arm/mach-exynos/pm_domains.c | 8 +++-
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-exynos/pm_domains.c 
> b/arch/arm/mach-exynos/pm_domains.c
> index 4a87e86dec45..7c21760f590f 100644
> --- a/arch/arm/mach-exynos/pm_domains.c
> +++ b/arch/arm/mach-exynos/pm_domains.c
> @@ -200,15 +200,15 @@ no_clk:
>   args.args_count = 0;
>   child_domain = of_genpd_get_from_provider(&args);
>   if (IS_ERR(child_domain))
> - goto next_pd;
> + continue;
>  
>   if (of_parse_phandle_with_args(np, "power-domains",
>"#power-domain-cells", 0, &args) != 0)
> - goto next_pd;
> + continue;
>  
>   parent_domain = of_genpd_get_from_provider(&args);
>   if (IS_ERR(parent_domain))
> - goto next_pd;
> + continue;
>  
>   if (pm_genpd_add_subdomain(parent_domain, child_domain))
>   pr_warn("%s failed to add subdomain: %s\n",
> @@ -216,8 +216,6 @@ no_clk:
>   else
>   pr_info("%s has as child subdomain: %s.\n",
>   parent_domain->name, child_domain->name);
> -next_pd:
> - of_node_put(np);
>   }
>  
>   return 0;

Looks good to me, applied.

Thanks,
Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] ARM: EXYNOS: Fix double of_node_put() when parsing child power domains

2015-10-11 Thread Krzysztof Kozlowski
On each next iteration of for_each_compatible_node() the reference
counter for current device node is already decreased by the loop
iterator. The manual call to of_node_get() is required only on loop
break which is not happening here.

The double of_node_get() (with enabled CONFIG_OF_DYNAMIC) lead to
decreasing the counter below expected, initial value.

Signed-off-by: Krzysztof Kozlowski 
Fixes: fe4034a3fad7 ("ARM: EXYNOS: Add missing of_node_put() when parsing power 
domains")
---
 arch/arm/mach-exynos/pm_domains.c | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-exynos/pm_domains.c 
b/arch/arm/mach-exynos/pm_domains.c
index 4a87e86dec45..7c21760f590f 100644
--- a/arch/arm/mach-exynos/pm_domains.c
+++ b/arch/arm/mach-exynos/pm_domains.c
@@ -200,15 +200,15 @@ no_clk:
args.args_count = 0;
child_domain = of_genpd_get_from_provider(&args);
if (IS_ERR(child_domain))
-   goto next_pd;
+   continue;
 
if (of_parse_phandle_with_args(np, "power-domains",
 "#power-domain-cells", 0, &args) != 0)
-   goto next_pd;
+   continue;
 
parent_domain = of_genpd_get_from_provider(&args);
if (IS_ERR(parent_domain))
-   goto next_pd;
+   continue;
 
if (pm_genpd_add_subdomain(parent_domain, child_domain))
pr_warn("%s failed to add subdomain: %s\n",
@@ -216,8 +216,6 @@ no_clk:
else
pr_info("%s has as child subdomain: %s.\n",
parent_domain->name, child_domain->name);
-next_pd:
-   of_node_put(np);
}
 
return 0;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/