PM / Domains: Do not restore all devices on power off error
Rafael J. Wysocki [Mon, 11 Jul 2011 22:39:48 +0000 (00:39 +0200)]
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>

drivers/base/power/domain.c

index 7e6cc8a..7b20801 100644 (file)
@@ -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;
@@ -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;
 }
 
 /**