PM / Domains: Check domain status during hibernation restore of devices

Power domains that were off before hibernation shouldn't be turned on
during device restore, so prevent that from happening.

This change fixes up commit 65533bbf63b4f37723fdfedc73d0653958973323

    PM / Domains: Fix hibernation restore of devices, v2

that didn't include it by mistake.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

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);