diff --git a/[refs] b/[refs] index 22464b70fe05..ae63c0174e9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e73c5ae6e7991a6c01f6d096ff8afaef4458c36 +refs/heads/master: 89a22dadb8810983868f5bbbc5530b27bf714a60 diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c index 3ff267861541..3adeb10ff3ec 100644 --- a/trunk/drivers/acpi/osl.c +++ b/trunk/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;