PM / Domains: Check domain status during hibernation restore of devices
Rafael J. Wysocki [Mon, 19 Mar 2012 09:38:14 +0000 (10:38 +0100)]
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>

drivers/base/power/domain.c

index b6ff6ec..73ce9fb 100644 (file)
@@ -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);