Commit 3c19c6a8 authored by Ben Hutchings's avatar Ben Hutchings

Revert "PM / Domains: Fix handling of wakeup devices during system resume"

This reverts commit 5c6156fa, which
was commit cc85b207 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: default avatarBen Hutchings <ben@decadent.org.uk>
parent 09427b65
......@@ -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;
/*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment