diff options
author | Len Brown <len.brown@intel.com> | 2009-12-15 22:27:39 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-12-15 22:27:39 -0500 |
commit | 173cc11a6e10c38ff7d4949b48e8d2eb0aee3e05 (patch) | |
tree | 44ac9a6fe4e9c51b2c54918aa338df7eda96b0a5 /drivers/acpi/acpica/nseval.c | |
parent | 8bea8672edfca7ec5f661cafb218f1205863b343 (diff) | |
parent | 88e5071525ad6814be3a8a2792ce9e81a0cca22a (diff) |
Merge branch 'acpica' into release
Diffstat (limited to 'drivers/acpi/acpica/nseval.c')
-rw-r--r-- | drivers/acpi/acpica/nseval.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c index f771e978c40..af9fe910373 100644 --- a/drivers/acpi/acpica/nseval.c +++ b/drivers/acpi/acpica/nseval.c @@ -381,6 +381,18 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj, method_obj->method.next_object); type = acpi_ns_get_type(parent_node); + /* + * Get the region handler and save it in the method object. We may need + * this if an operation region declaration causes a _REG method to be run. + * + * We can't do this in acpi_ps_link_module_code because + * acpi_gbl_root_node->Object is NULL at PASS1. + */ + if ((type == ACPI_TYPE_DEVICE) && parent_node->object) { + method_obj->method.extra.handler = + parent_node->object->device.handler; + } + /* Must clear next_object (acpi_ns_attach_object needs the field) */ method_obj->method.next_object = NULL; @@ -415,6 +427,12 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj, ACPI_DEBUG_PRINT((ACPI_DB_INIT, "Executed module-level code at %p\n", method_obj->method.aml_start)); + /* Delete a possible implicit return value (in slack mode) */ + + if (info->return_object) { + acpi_ut_remove_reference(info->return_object); + } + /* Detach the temporary method object */ acpi_ns_detach_object(parent_node); |