Merge tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[~andy/linux] / drivers / acpi / acpica / nssearch.c

diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 5d43efc53a6179ccd4a50e5997be84306891412c..47420faef073b4dada9fa8dc26252639c3213849 100644 (file)
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -381,7 +381,8 @@ acpi_ns_search_and_enter(u32 target_name,
 
        /* Node is an object defined by an External() statement */
 
-       if (flags & ACPI_NS_EXTERNAL) {
+       if (flags & ACPI_NS_EXTERNAL ||
+           (walk_state && walk_state->opcode == AML_SCOPE_OP)) {
                new_node->flags |= ANOBJ_IS_EXTERNAL;
        }
 #endif