Merge branch 'pm-domains'

* pm-domains:
  PM / Domains: Check domain status during hibernation restore of devices

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index b6ff6ecf519d95fd1f18c8e446b1c5f9af1d3991..73ce9fbe983961598d53f3bbeef0057cda084d4b 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1127,6 +1127,9 @@ static int pm_genpd_restore_noirq(struct device *dev)
                }
        }
 
+       if (genpd->suspend_power_off)
+               return 0;
+
        pm_genpd_poweron(genpd);
 
        return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev);