diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 15:35:37 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:35:37 -0400 |
| commit | 60e04a5c533785c23ce6b76a6e5058328fe68edb (patch) | |
| tree | 233d985e2195ae5917ec91cec650d8d11bae2e40 /drivers/acpi/ec.c | |
| parent | 61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143 (diff) | |
| parent | ff2fc3e9e3edb918b6c6b288485c6cb267bc865e (diff) | |
Pull ec into release branch
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 16 |
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) | |||
| 990 | int result = 0; | 990 | int result = 0; |
| 991 | acpi_status status = AE_OK; | 991 | acpi_status status = AE_OK; |
| 992 | union acpi_ec *ec = NULL; | 992 | union acpi_ec *ec = NULL; |
| 993 | unsigned long uid; | ||
| 994 | 993 | ||
| 995 | ACPI_FUNCTION_TRACE("acpi_ec_add"); | 994 | ACPI_FUNCTION_TRACE("acpi_ec_add"); |
| 996 | 995 | ||
| @@ -1013,10 +1012,9 @@ static int acpi_ec_poll_add(struct acpi_device *device) | |||
| 1013 | acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, | 1012 | acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, |
| 1014 | &ec->common.global_lock); | 1013 | &ec->common.global_lock); |
| 1015 | 1014 | ||
| 1016 | /* If our UID matches the UID for the ECDT-enumerated EC, | 1015 | /* XXX we don't test uids, because on some boxes ecdt uid = 0, see: |
| 1017 | we now have the *real* EC info, so kill the makeshift one. */ | 1016 | http://bugzilla.kernel.org/show_bug.cgi?id=6111 */ |
| 1018 | acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid); | 1017 | if (ec_ecdt) { |
| 1019 | if (ec_ecdt && ec_ecdt->common.uid == uid) { | ||
| 1020 | acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, | 1018 | acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, |
| 1021 | ACPI_ADR_SPACE_EC, | 1019 | ACPI_ADR_SPACE_EC, |
| 1022 | &acpi_ec_space_handler); | 1020 | &acpi_ec_space_handler); |
| @@ -1061,7 +1059,6 @@ static int acpi_ec_intr_add(struct acpi_device *device) | |||
| 1061 | int result = 0; | 1059 | int result = 0; |
| 1062 | acpi_status status = AE_OK; | 1060 | acpi_status status = AE_OK; |
| 1063 | union acpi_ec *ec = NULL; | 1061 | union acpi_ec *ec = NULL; |
| 1064 | unsigned long uid; | ||
| 1065 | 1062 | ||
| 1066 | ACPI_FUNCTION_TRACE("acpi_ec_add"); | 1063 | ACPI_FUNCTION_TRACE("acpi_ec_add"); |
| 1067 | 1064 | ||
| @@ -1087,10 +1084,9 @@ static int acpi_ec_intr_add(struct acpi_device *device) | |||
| 1087 | acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, | 1084 | acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, |
| 1088 | &ec->common.global_lock); | 1085 | &ec->common.global_lock); |
| 1089 | 1086 | ||
| 1090 | /* If our UID matches the UID for the ECDT-enumerated EC, | 1087 | /* XXX we don't test uids, because on some boxes ecdt uid = 0, see: |
| 1091 | we now have the *real* EC info, so kill the makeshift one. */ | 1088 | http://bugzilla.kernel.org/show_bug.cgi?id=6111 */ |
| 1092 | acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid); | 1089 | if (ec_ecdt) { |
| 1093 | if (ec_ecdt && ec_ecdt->common.uid == uid) { | ||
| 1094 | acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, | 1090 | acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, |
| 1095 | ACPI_ADR_SPACE_EC, | 1091 | ACPI_ADR_SPACE_EC, |
| 1096 | &acpi_ec_space_handler); | 1092 | &acpi_ec_space_handler); |