Merge branch 'pm-domains'

* pm-domains:
  PM / Domains: Check domain status during hibernation restore of devices
This commit is contained in:
Rafael J. Wysocki 2012-03-19 10:39:04 +01:00
commit 98e8bdafeb

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