Skip to content

Commit

Permalink
PM / Domains: Make failing pm_genpd_prepare() clean up properly
Browse files Browse the repository at this point in the history
If pm_generic_prepare() in pm_genpd_prepare() returns error code,
the PM domains counter of "prepared" devices should be decremented
and its suspend_power_off flag should be reset if this counter drops
down to zero.  Otherwise, the PM domain runtime PM code will not
handle the domain correctly (it will permanently think that system
suspend is in progress).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
  • Loading branch information
Rafael J. Wysocki committed Jul 11, 2011
1 parent 6f00ff7 commit b6c10c8
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion drivers/base/power/domain.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd)
static int pm_genpd_prepare(struct device *dev)
{
struct generic_pm_domain *genpd;
int ret;

dev_dbg(dev, "%s()\n", __func__);

Expand Down Expand Up @@ -400,7 +401,16 @@ static int pm_genpd_prepare(struct device *dev)

mutex_unlock(&genpd->lock);

return pm_generic_prepare(dev);
ret = pm_generic_prepare(dev);
if (ret) {
mutex_lock(&genpd->lock);

if (--genpd->prepared_count == 0)
genpd->suspend_power_off = false;

mutex_unlock(&genpd->lock);
}
return ret;
}

/**
Expand Down

0 comments on commit b6c10c8

Please sign in to comment.