3 files changed, 8 insertions, 1 deletions

diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 1055769f2f0..6d276c20b57 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -358,6 +358,7 @@ typedef enum {
  */
 struct acpi_object_extra {
         ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *method_REG;       /* _REG method for this region (if any) */
+        struct acpi_namespace_node *scope_node;
         void *region_context;   /* Region-specific data */
         u8 *aml_start;
         u32 aml_length;
diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c
index 42163d8db50..d69e4a53175 100644
--- a/drivers/acpi/acpica/dsargs.c
+++ b/drivers/acpi/acpica/dsargs.c
@@ -384,7 +384,7 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
 
         /* Execute the argument AML */
 
-        status = acpi_ds_execute_arguments(node, node->parent,
+        status = acpi_ds_execute_arguments(node, extra_desc->extra.scope_node,
                                            extra_desc->extra.aml_length,
                                            extra_desc->extra.aml_start);
         if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 110711afada..8a06dc523af 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -330,6 +330,12 @@ acpi_ex_create_region(u8 * aml_start,
         region_obj2 = obj_desc->common.next_object;
         region_obj2->extra.aml_start = aml_start;
         region_obj2->extra.aml_length = aml_length;
+        if (walk_state->scope_info) {
+                region_obj2->extra.scope_node =
+                    walk_state->scope_info->scope.node;
+        } else {
+                region_obj2->extra.scope_node = node;
+        }
 
         /* Init the region from the operands */