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>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c
index 2b3a01cc492..79a0d281f96 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: