1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 80cc76de2a4a..c036e2a69f33 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -990,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");
 
@@ -1013,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,
-           we now have the *real* EC info, so kill the makeshift one. */
-        acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid);
-        if (ec_ecdt && ec_ecdt->common.uid == uid) {
+        /* XXX we don't test uids, because on some boxes ecdt uid = 0, see:
+           http://bugzilla.kernel.org/show_bug.cgi?id=6111 */
+        if (ec_ecdt) {
                 acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
                                                   ACPI_ADR_SPACE_EC,
                                                   &acpi_ec_space_handler);
@@ -1061,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");
 
@@ -1087,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,
-           we now have the *real* EC info, so kill the makeshift one. */
-        acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid);
-        if (ec_ecdt && ec_ecdt->common.uid == uid) {
+        /* XXX we don't test uids, because on some boxes ecdt uid = 0, see:
+           http://bugzilla.kernel.org/show_bug.cgi?id=6111 */
+        if (ec_ecdt) {
                 acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
                                                   ACPI_ADR_SPACE_EC,
                                                   &acpi_ec_space_handler);