---

yaml --- r: 350999 b: refs/heads/master c: 89a22da h: refs/heads/master i: 350997: 08545b8 350995: d9c187b 350991: 20c3b51 v: v3
git-mirror · Feb 9, 2013 · c91cc17 · c91cc17
1 parent e1ce09a
commit c91cc17
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;