summaryrefslogtreecommitdiffstats
path: root/drivers/base/power/main.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:18:14 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:18:14 +0200
commit0d85fd42114ce97f209f3deb91ea0ac992c56013 (patch)
treef177a06c6cff29818e93d9bd9bc1ad85781be34e /drivers/base/power/main.c
parentab232ba57043ca85b55ffd7125f3f2c2d7e732ec (diff)
parentdb874c7e10557f8f1af9a6fb1ec6589ae06f349c (diff)
downloadop-kernel-dev-0d85fd42114ce97f209f3deb91ea0ac992c56013.zip
op-kernel-dev-0d85fd42114ce97f209f3deb91ea0ac992c56013.tar.gz
Merge branch 'pm-wakeirq'
* pm-wakeirq: PM / wakeirq: Fix typo in prototype for dev_pm_set_dedicated_wake_irq PM / Wakeirq: Add automated device wake IRQ handling
Diffstat (limited to 'drivers/base/power/main.c')
-rw-r--r--drivers/base/power/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 5528e59..30b7bbf 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -24,6 +24,7 @@
#include <linux/pm.h>
#include <linux/pm_runtime.h>
#include <linux/pm-trace.h>
+#include <linux/pm_wakeirq.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/async.h>
@@ -587,6 +588,7 @@ void dpm_resume_noirq(pm_message_t state)
async_synchronize_full();
dpm_show_time(starttime, state, "noirq");
resume_device_irqs();
+ device_wakeup_disarm_wake_irqs();
cpuidle_resume();
trace_suspend_resume(TPS("dpm_resume_noirq"), state.event, false);
}
@@ -1104,6 +1106,7 @@ int dpm_suspend_noirq(pm_message_t state)
trace_suspend_resume(TPS("dpm_suspend_noirq"), state.event, true);
cpuidle_pause();
+ device_wakeup_arm_wake_irqs();
suspend_device_irqs();
mutex_lock(&dpm_list_mtx);
pm_transition = state;
OpenPOWER on IntegriCloud