diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-08-05 21:45:11 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-08-05 21:45:11 +0200 |
| commit | fe202fde50a986a8510c62a76dc8733c1a8fac86 (patch) | |
| tree | 055cb487668446bcf184650039ac8a12268a6b81 /drivers | |
| parent | de96355c111679dd6e2c5c73e25e814c72510c58 (diff) | |
| download | linux-3.10-fe202fde50a986a8510c62a76dc8733c1a8fac86.tar.gz linux-3.10-fe202fde50a986a8510c62a76dc8733c1a8fac86.tar.bz2 linux-3.10-fe202fde50a986a8510c62a76dc8733c1a8fac86.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/power/domain.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index be8714aa9dd..e18566a0fed 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -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; } |