1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 49fdd4002b9f..da1d52576ec9 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -339,19 +339,16 @@ static void __pm_genpd_restore_device(struct pm_domain_data *pdd,
 {
         struct generic_pm_domain_data *gpd_data = to_gpd_data(pdd);
         struct device *dev = pdd->dev;
+        bool need_restore = gpd_data->need_restore;
 
-        if (!gpd_data->need_restore)
-                return;
-
+        gpd_data->need_restore = false;
         mutex_unlock(&genpd->lock);
 
         genpd_start_dev(genpd, dev);
-        genpd_restore_dev(genpd, dev);
-        genpd_stop_dev(genpd, dev);
+        if (need_restore)
+                genpd_restore_dev(genpd, dev);
 
         mutex_lock(&genpd->lock);
-
-        gpd_data->need_restore = false;
 }
 
 /**
@@ -595,7 +592,7 @@ static int pm_genpd_runtime_resume(struct device *dev)
 
         /* If power.irq_safe, the PM domain is never powered off. */
         if (dev->power.irq_safe)
-                goto out;
+                return genpd_start_dev(genpd, dev);
 
         mutex_lock(&genpd->lock);
         ret = __pm_genpd_poweron(genpd);
@@ -628,9 +625,6 @@ static int pm_genpd_runtime_resume(struct device *dev)
         wake_up_all(&genpd->status_wait_queue);
         mutex_unlock(&genpd->lock);
 
- out:
-        genpd_start_dev(genpd, dev);
-
         return 0;
 }