diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 00:52:19 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 00:52:19 +0100 |
| commit | 9bb4064ca3bd771f8df88529a3578f9bb5243911 (patch) | |
| tree | a148f0ff6ee2f5bb6d556ac7a39e30311862eafd /kernel/irq | |
| parent | Merge branches 'acpi-osl', 'acpi-pad', 'acpi-video' and 'acpi-assorted' (diff) | |
| parent | PM / hibernate: fix a comment typo (diff) | |
| download | wireguard-linux-9bb4064ca3bd771f8df88529a3578f9bb5243911.tar.xz wireguard-linux-9bb4064ca3bd771f8df88529a3578f9bb5243911.zip | |
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.c | 2 |
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; |