summaryrefslogtreecommitdiff
path: root/source/components/dispatcher/dswload2.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/components/dispatcher/dswload2.c')
-rw-r--r--source/components/dispatcher/dswload2.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/source/components/dispatcher/dswload2.c b/source/components/dispatcher/dswload2.c
index 27e317620911..90d85d6501da 100644
--- a/source/components/dispatcher/dswload2.c
+++ b/source/components/dispatcher/dswload2.c
@@ -243,6 +243,20 @@ AcpiDsLoad2BeginOp (
WalkState->ScopeInfo->Common.Value = ACPI_TYPE_ANY;
break;
+ case ACPI_TYPE_METHOD:
+
+ /*
+ * Allow scope change to root during execution of module-level
+ * code. Root is typed METHOD during this time.
+ */
+ if ((Node == AcpiGbl_RootNode) &&
+ (WalkState->ParseFlags & ACPI_PARSE_MODULE_LEVEL))
+ {
+ break;
+ }
+
+ /*lint -fallthrough */
+
default:
/* All other types are an error */