diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2013-09-04 23:57:32 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-09-10 01:57:29 +0100 |
| commit | 3c19c6a8bdb5454d4a98159adab3cc86418628da (patch) | |
| tree | 3c7b13f4453c34e72b1be510b34f7e311a5321d5 | |
| parent | 09427b652799cb707f9c1a6edadfce314e4902e6 (diff) | |
Revert "PM / Domains: Fix handling of wakeup devices during system resume"
This reverts commit 5c6156fac087f551cbd57499f4bed2fc614d70cd, which
was commit cc85b20780562d404e18a47b9b55b4a5102ae53e upstream.
It broke ARM && PM configurations by adding a call to
genpd_dev_active_wakeup() which was only added in Linux 3.3.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/base/power/domain.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 79038e50cb2a..6790cf7eba5a 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -751,8 +751,7 @@ static int pm_genpd_resume_noirq(struct device *dev) if (IS_ERR(genpd)) return -EINVAL; - if (genpd->suspend_power_off - || (dev->power.wakeup_path && genpd_dev_active_wakeup(genpd, dev))) + if (genpd->suspend_power_off) return 0; /* |