| From 83396d4b1611eebbb93949b08fe0d4c36d5f4982 Mon Sep 17 00:00:00 2001 |
| From: "Rafael J. Wysocki" <rjw@sisk.pl> |
| Date: Fri, 5 Aug 2011 21:45:11 +0200 |
| Subject: 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> |
| (cherry picked from commit fe202fde50a986a8510c62a76dc8733c1a8fac86) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| drivers/base/power/domain.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c |
| index be8714a..e18566a 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; |
| } |
| -- |
| 1.7.10.1.362.g242cab3 |
| |
