Skip to content

Commit fe202fd

Browse files
committed
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>
1 parent de96355 commit fe202fd

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/base/power/domain.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ static void genpd_set_active(struct generic_pm_domain *genpd)
8080
int pm_genpd_poweron(struct generic_pm_domain *genpd)
8181
{
8282
struct generic_pm_domain *parent = genpd->parent;
83-
DEFINE_WAIT(wait);
8483
int ret = 0;
8584

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

114113
if (genpd->power_on) {
115-
int ret = genpd->power_on(genpd);
114+
ret = genpd->power_on(genpd);
116115
if (ret)
117116
goto out;
118117
}

0 commit comments

Comments
 (0)