1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 3b8210ebb50e..60303aa28587 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1222,8 +1222,6 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,
 
         spin_unlock_irq(&dev->power.lock);
 
-        dev_pm_domain_set(dev, &genpd->domain);
-
         return gpd_data;
 
  err_free:
@@ -1237,8 +1235,6 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,
 static void genpd_free_dev_data(struct device *dev,
                                 struct generic_pm_domain_data *gpd_data)
 {
-        dev_pm_domain_set(dev, NULL);
-
         spin_lock_irq(&dev->power.lock);
 
         dev->power.subsys_data->domain_data = NULL;
@@ -1275,6 +1271,8 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
         if (ret)
                 goto out;
 
+        dev_pm_domain_set(dev, &genpd->domain);
+
         genpd->device_count++;
         genpd->max_off_time_changed = true;
 
@@ -1336,6 +1334,8 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,
         if (genpd->detach_dev)
                 genpd->detach_dev(genpd, dev);
 
+        dev_pm_domain_set(dev, NULL);
+
         list_del_init(&pdd->list_node);
 
         genpd_unlock(genpd);