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 65533bbf63

    PM / Domains: Fix hibernation restore of devices, v2

that didn't include it by mistake.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2012-03-19 10:38:14 +01:00
parent 57d13370cf
commit 18dd2ece3c

View 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); pm_genpd_poweron(genpd);
return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev); return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev);