Skip to content

Commit

Permalink
PM / Domains: Do not restore all devices on power off error
Browse files Browse the repository at this point in the history
Since every device in a PM domain has its own need_restore
flag, which is set by __pm_genpd_save_device(), there's no need to
walk the domain's device list and restore all devices on an error
from one of the drivers' .runtime_suspend() callbacks.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
  • Loading branch information
Rafael J. Wysocki committed Jul 11, 2011
1 parent c6d22b3 commit 697a7f3
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions drivers/base/power/domain.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,10 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)

list_for_each_entry_reverse(dle, &genpd->dev_list, node) {
ret = __pm_genpd_save_device(dle, genpd);
if (ret)
goto err_dev;
if (ret) {
genpd_set_active(genpd);
goto out;
}

if (genpd_abort_poweroff(genpd))
goto out;
Expand Down Expand Up @@ -311,13 +313,6 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)
genpd->poweroff_task = NULL;
wake_up_all(&genpd->status_wait_queue);
return ret;

err_dev:
list_for_each_entry_continue(dle, &genpd->dev_list, node)
__pm_genpd_restore_device(dle, genpd);

genpd_set_active(genpd);
goto out;
}

/**
Expand Down

0 comments on commit 697a7f3

Please sign in to comment.