diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-06 19:17:50 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-06 19:17:50 -0400 |
| commit | 28c399e2a1ed03bd175858deef1e233317103089 (patch) | |
| tree | 4e87f75cb4d6d52668030e36b5d000e80eb5e5d3 /drivers/acpi/osl.c | |
| parent | 0ede470030a35847a8b213bbdafb29d77bca76da (diff) | |
| parent | a8d46b9e4e487301affe84fa53de40b890898604 (diff) | |
Merge branch 'acpi-pm'
* acpi-pm:
ACPI / sleep: Rework the handling of ACPI GPE wakeup from suspend-to-idle
PM / sleep: Rename platform suspend/resume functions in suspend.c
PM / sleep: Export dpm_suspend_late/noirq() and dpm_resume_early/noirq()
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 938b6ac71dde..9964f70be98d 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -835,7 +835,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, | |||
| 835 | 835 | ||
| 836 | acpi_irq_handler = handler; | 836 | acpi_irq_handler = handler; |
| 837 | acpi_irq_context = context; | 837 | acpi_irq_context = context; |
| 838 | if (request_irq(irq, acpi_irq, IRQF_SHARED | IRQF_NO_SUSPEND, "acpi", acpi_irq)) { | 838 | if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) { |
| 839 | printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq); | 839 | printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq); |
| 840 | acpi_irq_handler = NULL; | 840 | acpi_irq_handler = NULL; |
| 841 | return AE_NOT_ACQUIRED; | 841 | return AE_NOT_ACQUIRED; |