summaryrefslogtreecommitdiff
path: root/kernel/irq
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-02 00:52:19 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-02 00:52:19 +0100
commit9bb4064ca3bd771f8df88529a3578f9bb5243911 (patch)
treea148f0ff6ee2f5bb6d556ac7a39e30311862eafd /kernel/irq
parent66c44877242d37873df2abb10e4fce26ff4fc9f9 (diff)
parentd439e64f22ce0eea681ae90c71f584d3a0145ded (diff)
downloadlinux-sh-9bb4064ca3bd771f8df88529a3578f9bb5243911.tar.gz
Merge branch 'pm-sleep'
* pm-sleep: PM / hibernate: fix a comment typo input: i8042: Avoid resetting controller on system suspend/resume PM / PCI / ACPI: Kick devices that might have been reset by firmware PM / sleep: Add flags to indicate platform firmware involvement PM / sleep: Drop pm_request_idle() from pm_generic_complete() PCI / PM: Avoid resuming more devices during system suspend PM / wakeup: wakeup_source_create: use kstrdup_const PM / sleep: Report interrupt that caused system wakeup
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index 21c62617a35a..e80c4400118a 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -21,7 +21,7 @@ bool irq_pm_check_wakeup(struct irq_desc *desc)
desc->istate |= IRQS_SUSPENDED | IRQS_PENDING;
desc->depth++;
irq_disable(desc);
- pm_system_wakeup();
+ pm_system_irq_wakeup(irq_desc_get_irq(desc));
return true;
}
return false;