From c2758789be62fec95a950f07a42d4ef15f7d82a8 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Tue, 12 Jul 2011 00:39:48 +0200 Subject: [PATCH] --- yaml --- r: 256945 b: refs/heads/master c: 697a7f3727b53c7d4c927948bbe1f6afc4fabfde h: refs/heads/master i: 256943: ed319dbd63d35d3e193bf96ae931a10e085c0424 v: v3 --- [refs] | 2 +- trunk/drivers/base/power/domain.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index d7ab4123d89a..0b99a7ef37a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6d22b37263607ba5aeeb2e11169fa65caa29bee +refs/heads/master: 697a7f3727b53c7d4c927948bbe1f6afc4fabfde diff --git a/trunk/drivers/base/power/domain.c b/trunk/drivers/base/power/domain.c index 7e6cc8a5ce5b..7b20801d19da 100644 --- a/trunk/drivers/base/power/domain.c +++ b/trunk/drivers/base/power/domain.c @@ -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; } /**