vserver 1.9.3

[linux-2.6.git] / drivers / acpi / ec.c

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 56bb801..d141914 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -381,7 +381,7 @@ end:
        acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_NOT_ISR);
 }
 
-static void
+static u32
 acpi_ec_gpe_handler (
        void                    *data)
 {
@@ -389,12 +389,17 @@ acpi_ec_gpe_handler (
        struct acpi_ec          *ec = (struct acpi_ec *) data;
 
        if (!ec)
-               return;
+               return ACPI_INTERRUPT_NOT_HANDLED;
 
        acpi_disable_gpe(NULL, ec->gpe_bit, ACPI_ISR);
 
        status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
                acpi_ec_gpe_query, ec);
+
+       if (status == AE_OK)
+               return ACPI_INTERRUPT_HANDLED;
+       else
+               return ACPI_INTERRUPT_NOT_HANDLED;
 }
 
 /* --------------------------------------------------------------------------
@@ -729,6 +734,8 @@ acpi_ec_start (
        if (ACPI_FAILURE(status)) {
                return_VALUE(-ENODEV);
        }
+       acpi_set_gpe_type (NULL, ec->gpe_bit, ACPI_GPE_TYPE_RUNTIME);
+       acpi_enable_gpe (NULL, ec->gpe_bit, ACPI_NOT_ISR);
 
        status = acpi_install_address_space_handler (ec->handle,
                        ACPI_ADR_SPACE_EC, &acpi_ec_space_handler,
@@ -814,6 +821,8 @@ acpi_ec_ecdt_probe (void)
        if (ACPI_FAILURE(status)) {
                goto error;
        }
+       acpi_set_gpe_type (NULL, ec_ecdt->gpe_bit, ACPI_GPE_TYPE_RUNTIME);
+       acpi_enable_gpe (NULL, ec_ecdt->gpe_bit, ACPI_NOT_ISR);
 
        status = acpi_install_address_space_handler (ACPI_ROOT_OBJECT,
                        ACPI_ADR_SPACE_EC, &acpi_ec_space_handler,