summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/executer
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2008-04-10 19:06:41 +0400
committerLen Brown <len.brown@intel.com>2008-04-22 14:29:27 -0400
commite5bcc811f78f294e7be8a0721b3fb513028c5af4 (patch)
tree8545f7f57de2e3947cb73df726bfe4e3b122ad98 /drivers/acpi/executer
parent1f549a240ccb2755066587e1e6ef9f74f485a46a (diff)
downloadop-kernel-dev-e5bcc811f78f294e7be8a0721b3fb513028c5af4.zip
op-kernel-dev-e5bcc811f78f294e7be8a0721b3fb513028c5af4.tar.gz
ACPICA: Fixed a problem with Index references passed as method arguments
References passed as arguments to control methods were dereferenced immediately (before control was passed to the called method). The references are now correctly passed directly to the called method. http://bugzilla.kernel.org/show_bug.cgi?id=5389 Signed-off-by: Lin Ming <ming.m.lin@intel.com> 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/exresolv.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 74ab220..795ec8c 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -194,6 +194,12 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
case ACPI_TYPE_PACKAGE:
+ /* If method call - leave the Reference on the stack */
+
+ if (walk_state->opcode == AML_INT_METHODCALL_OP) {
+ break;
+ }
+
obj_desc = *stack_desc->reference.where;
if (obj_desc) {
/*
@@ -210,7 +216,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
* the package, can't dereference it
*/
ACPI_ERROR((AE_INFO,
- "Attempt to deref an Index to NULL pkg element Idx=%p",
+ "Attempt to dereference an Index to NULL package element Idx=%p",
stack_desc));
status = AE_AML_UNINITIALIZED_ELEMENT;
}
@@ -221,7 +227,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
/* Invalid reference object */
ACPI_ERROR((AE_INFO,
- "Unknown TargetType %X in Index/Reference obj %p",
+ "Unknown TargetType %X in Index/Reference object %p",
stack_desc->reference.target_type,
stack_desc));
status = AE_AML_INTERNAL;
OpenPOWER on IntegriCloud