Commit c67aafd6 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Kevin Hilman

soc: amlogic: meson-ee-pwrc: propagate errors from pm_genpd_init()

pm_genpd_init() can return an error. Propagate the error code to prevent
the driver from indicating that it successfully probed while there were
errors during pm_genpd_init().

Fixes: eef3c2ba ("soc: amlogic: Add support for Everything-Else power domains controller")
Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 0766d65e
...@@ -323,6 +323,8 @@ static int meson_ee_pwrc_init_domain(struct platform_device *pdev, ...@@ -323,6 +323,8 @@ static int meson_ee_pwrc_init_domain(struct platform_device *pdev,
struct meson_ee_pwrc *pwrc, struct meson_ee_pwrc *pwrc,
struct meson_ee_pwrc_domain *dom) struct meson_ee_pwrc_domain *dom)
{ {
int ret;
dom->pwrc = pwrc; dom->pwrc = pwrc;
dom->num_rstc = dom->desc.reset_names_count; dom->num_rstc = dom->desc.reset_names_count;
dom->num_clks = dom->desc.clk_names_count; dom->num_clks = dom->desc.clk_names_count;
...@@ -368,15 +370,21 @@ static int meson_ee_pwrc_init_domain(struct platform_device *pdev, ...@@ -368,15 +370,21 @@ static int meson_ee_pwrc_init_domain(struct platform_device *pdev,
* prepare/enable counters won't be in sync. * prepare/enable counters won't be in sync.
*/ */
if (dom->num_clks && dom->desc.get_power && !dom->desc.get_power(dom)) { if (dom->num_clks && dom->desc.get_power && !dom->desc.get_power(dom)) {
int ret = clk_bulk_prepare_enable(dom->num_clks, dom->clks); ret = clk_bulk_prepare_enable(dom->num_clks, dom->clks);
if (ret) if (ret)
return ret; return ret;
pm_genpd_init(&dom->base, &pm_domain_always_on_gov, false); ret = pm_genpd_init(&dom->base, &pm_domain_always_on_gov,
} else false);
pm_genpd_init(&dom->base, NULL, if (ret)
(dom->desc.get_power ? return ret;
dom->desc.get_power(dom) : true)); } else {
ret = pm_genpd_init(&dom->base, NULL,
(dom->desc.get_power ?
dom->desc.get_power(dom) : true));
if (ret)
return ret;
}
return 0; return 0;
} }
......
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