diff options
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r-- | drivers/acpi/ec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 13593f9f2197..638a68679a42 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -718,6 +718,7 @@ static acpi_status | |||
718 | ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval) | 718 | ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval) |
719 | { | 719 | { |
720 | acpi_status status; | 720 | acpi_status status; |
721 | unsigned long long tmp; | ||
721 | 722 | ||
722 | struct acpi_ec *ec = context; | 723 | struct acpi_ec *ec = context; |
723 | status = acpi_walk_resources(handle, METHOD_NAME__CRS, | 724 | status = acpi_walk_resources(handle, METHOD_NAME__CRS, |
@@ -727,11 +728,13 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval) | |||
727 | 728 | ||
728 | /* Get GPE bit assignment (EC events). */ | 729 | /* Get GPE bit assignment (EC events). */ |
729 | /* TODO: Add support for _GPE returning a package */ | 730 | /* TODO: Add support for _GPE returning a package */ |
730 | status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe); | 731 | status = acpi_evaluate_integer(handle, "_GPE", NULL, &tmp); |
731 | if (ACPI_FAILURE(status)) | 732 | if (ACPI_FAILURE(status)) |
732 | return status; | 733 | return status; |
734 | ec->gpe = tmp; | ||
733 | /* Use the global lock for all EC transactions? */ | 735 | /* Use the global lock for all EC transactions? */ |
734 | acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock); | 736 | acpi_evaluate_integer(handle, "_GLK", NULL, &tmp); |
737 | ec->global_lock = tmp; | ||
735 | ec->handle = handle; | 738 | ec->handle = handle; |
736 | return AE_CTRL_TERMINATE; | 739 | return AE_CTRL_TERMINATE; |
737 | } | 740 | } |