diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-23 05:33:29 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 05:33:29 +0200 |
| commit | 7674416db4ee3d43813dddb650364ca994755256 (patch) | |
| tree | 1a4549823d7bdd892dc3b3b7b3fa9214216ac384 /drivers/acpi/ec.c | |
| parent | Merge branch 'thinkpad' into test (diff) | |
| parent | ACPI: Change acpi_evaluate_integer to support 64-bit on 32-bit kernels (diff) | |
| download | linux-7674416db4ee3d43813dddb650364ca994755256.tar.xz linux-7674416db4ee3d43813dddb650364ca994755256.zip | |
Merge branch 'ull' into test
Conflicts:
drivers/acpi/bay.c
drivers/acpi/dock.c
drivers/ata/libata-acpi.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 40fefba6264e..ef42316f89f5 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -736,6 +736,7 @@ static acpi_status ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval) { acpi_status status; + unsigned long long tmp; struct acpi_ec *ec = context; status = acpi_walk_resources(handle, METHOD_NAME__CRS, @@ -745,11 +746,13 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval) /* Get GPE bit assignment (EC events). */ /* TODO: Add support for _GPE returning a package */ - status = acpi_evaluate_integer(handle, "_GPE", NULL, &ec->gpe); + status = acpi_evaluate_integer(handle, "_GPE", NULL, &tmp); if (ACPI_FAILURE(status)) return status; + ec->gpe = tmp; /* Use the global lock for all EC transactions? */ - acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock); + acpi_evaluate_integer(handle, "_GLK", NULL, &tmp); + ec->global_lock = tmp; ec->handle = handle; return AE_CTRL_TERMINATE; } |