summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2013-02-04 07:10:10 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-09 22:30:44 +0100
commit89a22dadb8810983868f5bbbc5530b27bf714a60 (patch)
tree6098bc06d3b38b7358791529e510fa3917939780
parent7e73c5ae6e7991a6c01f6d096ff8afaef4458c36 (diff)
downloadblackbird-op-linux-89a22dadb8810983868f5bbbc5530b27bf714a60.tar.gz
blackbird-op-linux-89a22dadb8810983868f5bbbc5530b27bf714a60.zip
ACPI: enable ACPI SCI during suspend
Enable ACPI SCI during suspend so that SCI can be used as wake events for PM_SUSPEND_FREEZE. For S3/S4 transition, We disable all GPEs in suspend_ops->prepare_late() to fix a problem that GPEs may trigger SCI before arch_suspend_disable_irqs() is run. So it is safe to leave the SCI enabled until arch_suspend_irq_disable() is run. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/osl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 3ff267861541..3adeb10ff3ec 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -787,7 +787,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
acpi_irq_handler = handler;
acpi_irq_context = context;
- if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) {
+ if (request_irq(irq, acpi_irq, IRQF_SHARED | IRQF_NO_SUSPEND, "acpi", acpi_irq)) {
printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);
acpi_irq_handler = NULL;
return AE_NOT_ACQUIRED;
OpenPOWER on IntegriCloud