aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/ec.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r--drivers/acpi/ec.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 40fefba6264e..ef42316f89f5 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -736,6 +736,7 @@ static acpi_status
736ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval) 736ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
737{ 737{
738 acpi_status status; 738 acpi_status status;
739 unsigned long long tmp;
739 740
740 struct acpi_ec *ec = context; 741 struct acpi_ec *ec = context;
741 status = acpi_walk_resources(handle, METHOD_NAME__CRS, 742 status = acpi_walk_resources(handle, METHOD_NAME__CRS,
@@ -745,11 +746,13 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
745 746
746 /* Get GPE bit assignment (EC events). */ 747 /* Get GPE bit assignment (EC events). */
747 /* TODO: Add support for _GPE returning a package */ 748 /* TODO: Add support for _GPE returning a package */
748 status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe); 749 status = acpi_evaluate_integer(handle, "_GPE", NULL, &tmp);
749 if (ACPI_FAILURE(status)) 750 if (ACPI_FAILURE(status))
750 return status; 751 return status;
752 ec->gpe = tmp;
751 /* Use the global lock for all EC transactions? */ 753 /* Use the global lock for all EC transactions? */
752 acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock); 754 acpi_evaluate_integer(handle, "_GLK", NULL, &tmp);
755 ec->global_lock = tmp;
753 ec->handle = handle; 756 ec->handle = handle;
754 return AE_CTRL_TERMINATE; 757 return AE_CTRL_TERMINATE;
755} 758}