From c91cc171d083372feddcb7fd919a15e8b679388a Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Mon, 4 Feb 2013 07:10:10 +0000 Subject: [PATCH] --- yaml --- r: 350999 b: refs/heads/master c: 89a22dadb8810983868f5bbbc5530b27bf714a60 h: refs/heads/master i: 350997: 08545b8711f96c97f555166f5122417758d0c0a7 350995: d9c187b0bf89faeed6acaf9905282bad572371e1 350991: 20c3b51e74cf0cd2c0554409935780d6294cad0d v: v3 --- [refs] | 2 +- trunk/drivers/acpi/osl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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;