|
@@ -269,8 +269,10 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)
|
|
|
|
|
|
list_for_each_entry_reverse(dle, &genpd->dev_list, node) {
|
|
list_for_each_entry_reverse(dle, &genpd->dev_list, node) {
|
|
ret = __pm_genpd_save_device(dle, genpd);
|
|
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))
|
|
if (genpd_abort_poweroff(genpd))
|
|
goto out;
|
|
goto out;
|
|
@@ -311,13 +313,6 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)
|
|
genpd->poweroff_task = NULL;
|
|
genpd->poweroff_task = NULL;
|
|
wake_up_all(&genpd->status_wait_queue);
|
|
wake_up_all(&genpd->status_wait_queue);
|
|
return ret;
|
|
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;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|