diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-19 05:39:04 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-19 05:39:04 -0400 |
| commit | 98e8bdafeb4728a6af7bbcbcc3984967d1cf2bc1 (patch) | |
| tree | 8c8df356d14b88998d20a32b5fee225c958cd95a /drivers | |
| parent | 0f0cc1687d7e41ac59e4eaf057aa2fb9e48a9dd3 (diff) | |
| parent | 18dd2ece3cde14cfd42e95a89eb14016699a5f15 (diff) | |
Merge branch 'pm-domains'
* pm-domains:
PM / Domains: Check domain status during hibernation restore of devices
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/power/domain.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index b6ff6ecf519d..73ce9fbe9839 100644 --- 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) | |||
| 1127 | } | 1127 | } |
| 1128 | } | 1128 | } |
| 1129 | 1129 | ||
| 1130 | if (genpd->suspend_power_off) | ||
| 1131 | return 0; | ||
| 1132 | |||
| 1130 | pm_genpd_poweron(genpd); | 1133 | pm_genpd_poweron(genpd); |
| 1131 | 1134 | ||
| 1132 | return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev); | 1135 | return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev); |