summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/dswload2.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-11-29 22:05:52 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-11-29 22:05:52 +0100
commit3e407c16f571b723c6d446e707d9e60cf53cd415 (patch)
treeef376219e656b4a3ec94e0ed2ff43e6acaa72ced /drivers/acpi/acpica/dswload2.c
parentae6b3e54aa52cd29965b8e4e47000ed2c5d78eb8 (diff)
parent087286585d8b6e63ffc1e56cbbbcda72ce254e22 (diff)
Merge back earlier ACPICA changes for 4.21.
Diffstat (limited to 'drivers/acpi/acpica/dswload2.c')
-rw-r--r--drivers/acpi/acpica/dswload2.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index b4685bb5f071..fa38bb3009d5 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
@@ -296,6 +296,14 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
}
#endif
+ /*
+ * For name creation opcodes, the full namepath prefix must
+ * exist, except for the final (new) nameseg.
+ */
+ if (walk_state->op_info->flags & AML_NAMED) {
+ flags |= ACPI_NS_PREFIX_MUST_EXIST;
+ }
+
/* Add new entry or lookup existing entry */
status =