summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-03-19 10:39:04 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2012-03-19 10:39:04 +0100
commit98e8bdafeb4728a6af7bbcbcc3984967d1cf2bc1 (patch)
tree8c8df356d14b88998d20a32b5fee225c958cd95a /drivers/base
parent0f0cc1687d7e41ac59e4eaf057aa2fb9e48a9dd3 (diff)
parent18dd2ece3cde14cfd42e95a89eb14016699a5f15 (diff)
downloadlinux-98e8bdafeb4728a6af7bbcbcc3984967d1cf2bc1.tar.bz2
Merge branch 'pm-domains'
* pm-domains: PM / Domains: Check domain status during hibernation restore of devices
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/domain.c3
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)
}
}
+ if (genpd->suspend_power_off)
+ return 0;
+
pm_genpd_poweron(genpd);
return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev);