Commit fe4034a3 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Kukjin Kim

ARM: EXYNOS: Add missing of_node_put() when parsing power domains

Add missing of_node_put() to:
1. Error return path if allocating memory for exynos_pm_domain failed.
2. Second iteration over power domains if a child domain was not
   present or was incomplete.
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Reported-by: default avatarKarol Wrona <k.wrona@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene@kernel.org>
parent c88cad34
...@@ -138,6 +138,7 @@ static __init int exynos4_pm_init_power_domain(void) ...@@ -138,6 +138,7 @@ static __init int exynos4_pm_init_power_domain(void)
if (!pd) { if (!pd) {
pr_err("%s: failed to allocate memory for domain\n", pr_err("%s: failed to allocate memory for domain\n",
__func__); __func__);
of_node_put(np);
return -ENOMEM; return -ENOMEM;
} }
...@@ -209,15 +210,15 @@ static __init int exynos4_pm_init_power_domain(void) ...@@ -209,15 +210,15 @@ static __init int exynos4_pm_init_power_domain(void)
args.args_count = 0; args.args_count = 0;
child_domain = of_genpd_get_from_provider(&args); child_domain = of_genpd_get_from_provider(&args);
if (IS_ERR(child_domain)) if (IS_ERR(child_domain))
continue; goto next_pd;
if (of_parse_phandle_with_args(np, "power-domains", if (of_parse_phandle_with_args(np, "power-domains",
"#power-domain-cells", 0, &args) != 0) "#power-domain-cells", 0, &args) != 0)
continue; goto next_pd;
parent_domain = of_genpd_get_from_provider(&args); parent_domain = of_genpd_get_from_provider(&args);
if (IS_ERR(parent_domain)) if (IS_ERR(parent_domain))
continue; goto next_pd;
if (pm_genpd_add_subdomain(parent_domain, child_domain)) if (pm_genpd_add_subdomain(parent_domain, child_domain))
pr_warn("%s failed to add subdomain: %s\n", pr_warn("%s failed to add subdomain: %s\n",
...@@ -225,6 +226,7 @@ static __init int exynos4_pm_init_power_domain(void) ...@@ -225,6 +226,7 @@ static __init int exynos4_pm_init_power_domain(void)
else else
pr_info("%s has as child subdomain: %s.\n", pr_info("%s has as child subdomain: %s.\n",
parent_domain->name, child_domain->name); parent_domain->name, child_domain->name);
next_pd:
of_node_put(np); of_node_put(np);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment