| commit | 98e8bdafeb4728a6af7bbcbcc3984967d1cf2bc1 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rjw@sisk.pl> | Mon Mar 19 10:39:04 2012 +0100 |
| committer | Rafael J. Wysocki <rjw@sisk.pl> | Mon Mar 19 10:39:04 2012 +0100 |
| tree | 8c8df356d14b88998d20a32b5fee225c958cd95a | |
| parent | 0f0cc1687d7e41ac59e4eaf057aa2fb9e48a9dd3 [diff] | |
| parent | 18dd2ece3cde14cfd42e95a89eb14016699a5f15 [diff] |
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 b6ff6ec..73ce9fb 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c
@@ -1127,6 +1127,9 @@ } } + if (genpd->suspend_power_off) + return 0; + pm_genpd_poweron(genpd); return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev);