From: Ben Hutchings Date: Wed, 4 Sep 2013 22:57:32 +0000 (+0100) Subject: Revert "PM / Domains: Fix handling of wakeup devices during system resume" X-Git-Tag: v3.2.51~33 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=3c19c6a8bdb5454d4a98159adab3cc86418628da;p=unionfs-2.6.39.y.git 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 --- diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 79038e50cb2..6790cf7eba5 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; /*