diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-26 23:24:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-02 10:32:10 -0700 |
| commit | fd0682d1b4f47792cfe668c7979d73f168e9f1aa (patch) | |
| tree | 89d9033d96acab66577b8131ac45ff9f1dd9eda5 /drivers | |
| parent | 8119557d5627c7a823641a7c5c307f709e2d5b04 (diff) | |
| download | lwn-fd0682d1b4f47792cfe668c7979d73f168e9f1aa.tar.gz lwn-fd0682d1b4f47792cfe668c7979d73f168e9f1aa.zip | |
PM / Domains: Check domain status during hibernation restore of devices
This is a backport of mainline commit
18dd2ece3cde14cfd42e95a89eb14016699a5f15.
Power domains that were off before hibernation shouldn't be turned on
during device restore, so prevent that from happening.
This change fixed up mainline commit
65533bbf63b4f37723fdfedc73d0653958973323
PM / Domains: Fix hibernation restore of devices, v2
that didn't include it by mistake.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 6d574eef9810..5771275f1be4 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1064,6 +1064,9 @@ static int pm_genpd_restore_noirq(struct device *dev) } } + if (genpd->suspend_power_off) + return 0; + pm_genpd_poweron(genpd); genpd_start_dev(genpd, dev); |