Commit fe202fde authored Aug 05, 2011 by Rafael J. Wysocki

PM / Domains: Fix pm_genpd_poweron()



The local variable ret is defined twice in pm_genpd_poweron(), which
causes this function to always return 0, even if the PM domain's
.power_on() callback fails, in which case an error code should be
returned.

Remove the wrong second definition of ret and additionally remove an
unnecessary definition of wait from pm_genpd_poweron().

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

parent de96355c

drivers/base/power/domain.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -80,7 +80,6 @@ static void genpd_set_active(struct generic_pm_domain *genpd)
		int pm_genpd_poweron(struct generic_pm_domain *genpd)
		{
		struct generic_pm_domain *parent = genpd->parent;
		DEFINE_WAIT(wait);
		int ret = 0;

		start:
		@@ -112,7 +111,7 @@ int pm_genpd_poweron(struct generic_pm_domain *genpd)
		}

		if (genpd->power_on) {
		int ret = genpd->power_on(genpd);
		ret = genpd->power_on(genpd);
		if (ret)
		goto out;
		}