diff options
author | Bob Moore <robert.moore@intel.com> | 2008-04-10 19:06:40 +0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-04-22 14:29:27 -0400 |
commit | b160987df7f49ee9c048a43b70ebae613a7e1437 (patch) | |
tree | 612a648e839711f0cb3485467b2f0748199ea7ba /drivers/acpi/executer | |
parent | f2d69559b31c368cfe3a51607d9cd5e8c0168875 (diff) | |
download | op-kernel-dev-b160987df7f49ee9c048a43b70ebae613a7e1437.zip op-kernel-dev-b160987df7f49ee9c048a43b70ebae613a7e1437.tar.gz |
ACPICA: Fixes a problem with control method references within packages
Completes the package changes started with version 20071019.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/executer')
-rw-r--r-- | drivers/acpi/executer/exresnte.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c index 2b3a01c..79a0d28 100644 --- a/drivers/acpi/executer/exresnte.c +++ b/drivers/acpi/executer/exresnte.c @@ -116,9 +116,11 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr, * Several object types require no further processing: * 1) Device/Thermal objects don't have a "real" subobject, return the Node * 2) Method locals and arguments have a pseudo-Node + * 3) 10/2007: Added method type to assist with Package construction. */ if ((entry_type == ACPI_TYPE_DEVICE) || (entry_type == ACPI_TYPE_THERMAL) || + (entry_type == ACPI_TYPE_METHOD) || (node->flags & (ANOBJ_METHOD_ARG | ANOBJ_METHOD_LOCAL))) { return_ACPI_STATUS(AE_OK); } @@ -214,7 +216,6 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr, /* For these objects, just return the object attached to the Node */ case ACPI_TYPE_MUTEX: - case ACPI_TYPE_METHOD: case ACPI_TYPE_POWER: case ACPI_TYPE_PROCESSOR: case ACPI_TYPE_EVENT: |