1 files changed, 10 insertions, 15 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 79b09d76c180..c036e2a69f33 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -763,8 +763,7 @@ static u32 acpi_ec_gpe_poll_handler(void *data)
        acpi_disable_gpe(NULL, ec->common.gpe_bit, ACPI_ISR);
-        status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
+        status = acpi_os_execute(OSL_EC_POLL_HANDLER, acpi_ec_gpe_query, ec);
-                                             acpi_ec_gpe_query, ec);
        if (status == AE_OK)
                return ACPI_INTERRUPT_HANDLED;
@@ -799,7 +798,7 @@ static u32 acpi_ec_gpe_intr_handler(void *data)
        if (value & ACPI_EC_FLAG_SCI) {
                atomic_add(1, &ec->intr.pending_gpe);
-                status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
+                status = acpi_os_execute(OSL_EC_BURST_HANDLER,
                                                     acpi_ec_gpe_query, ec);
                return status == AE_OK ?
                    ACPI_INTERRUPT_HANDLED : ACPI_INTERRUPT_NOT_HANDLED;
@@ -991,7 +990,6 @@ static int acpi_ec_poll_add(struct acpi_device *device)
        int result = 0;
        acpi_status status = AE_OK;
        union acpi_ec *ec = NULL;
-        unsigned long uid;
        ACPI_FUNCTION_TRACE("acpi_ec_add");
@@ -1014,10 +1012,9 @@ static int acpi_ec_poll_add(struct acpi_device *device)
        acpi_evaluate_integer(ec->common.handle, "_GLK", NULL,
                              &ec->common.global_lock);
-        /* If our UID matches the UID for the ECDT-enumerated EC,
+        /* XXX we don't test uids, because on some boxes ecdt uid = 0, see:
-           we now have the *real* EC info, so kill the makeshift one. */
+           http://bugzilla.kernel.org/show_bug.cgi?id=6111 */
-        acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid);
+        if (ec_ecdt) {
-        if (ec_ecdt && ec_ecdt->common.uid == uid) {
                acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
                                                  ACPI_ADR_SPACE_EC,
                                                  &acpi_ec_space_handler);
@@ -1062,7 +1059,6 @@ static int acpi_ec_intr_add(struct acpi_device *device)
        int result = 0;
        acpi_status status = AE_OK;
        union acpi_ec *ec = NULL;
-        unsigned long uid;
        ACPI_FUNCTION_TRACE("acpi_ec_add");
@@ -1088,10 +1084,9 @@ static int acpi_ec_intr_add(struct acpi_device *device)
        acpi_evaluate_integer(ec->common.handle, "_GLK", NULL,
                              &ec->common.global_lock);
-        /* If our UID matches the UID for the ECDT-enumerated EC,
+        /* XXX we don't test uids, because on some boxes ecdt uid = 0, see:
-           we now have the *real* EC info, so kill the makeshift one. */
+           http://bugzilla.kernel.org/show_bug.cgi?id=6111 */
-        acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid);
+        if (ec_ecdt) {
-        if (ec_ecdt && ec_ecdt->common.uid == uid) {
                acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
                                                  ACPI_ADR_SPACE_EC,
                                                  &acpi_ec_space_handler);
@@ -1572,7 +1567,7 @@ static void __exit acpi_ec_exit(void)
 static int __init acpi_fake_ecdt_setup(char *str)
 {
        acpi_fake_ecdt_enabled = 1;
-        return 0;
+        return 1;
 }
 __setup("acpi_fake_ecdt", acpi_fake_ecdt_setup);
@@ -1591,7 +1586,7 @@ static int __init acpi_ec_set_intr_mode(char *str)
                acpi_ec_driver.ops.add = acpi_ec_poll_add;
        }
        printk(KERN_INFO PREFIX "EC %s mode.\n", intr ? "interrupt" : "polling");
-        return 0;
+        return 1;
 }
 __setup("ec_intr=", acpi_ec_set_intr_mode);