Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

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

diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 1d2d8ffc1bc57045e833121c57cb15daa8e797b2..5d43efc53a6179ccd4a50e5997be84306891412c 100644 (file)
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2013, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -328,6 +328,11 @@ acpi_ns_search_and_enter(u32 target_name,
                if ((status == AE_OK) && (flags & ACPI_NS_ERROR_IF_FOUND)) {
                        status = AE_ALREADY_EXISTS;
                }
+#ifdef ACPI_ASL_COMPILER
+               if (*return_node && (*return_node)->type == ACPI_TYPE_ANY) {
+                       (*return_node)->flags |= ANOBJ_IS_EXTERNAL;
+               }
+#endif
 
                /* Either found it or there was an error: finished either way */