ACPICA: Namespace: Add support to allow overriding objects

[karo-tx-linux.git] / drivers / acpi / acpica / nsaccess.c

diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 24fa19a76d704102b89ada50aa836dbf95d0171e..19ad0b5993d58583516f3f7941c45f7c46ebfeb1 100644 (file)
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -304,7 +304,9 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
-       local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND | ACPI_NS_SEARCH_PARENT);
+       local_flags = flags &
+           ~(ACPI_NS_ERROR_IF_FOUND | ACPI_NS_OVERRIDE_IF_FOUND |
+             ACPI_NS_SEARCH_PARENT);
        *return_node = ACPI_ENTRY_NOT_FOUND;
        acpi_gbl_ns_lookup_count++;
 
@@ -547,6 +549,12 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                        if (flags & ACPI_NS_ERROR_IF_FOUND) {
                                local_flags |= ACPI_NS_ERROR_IF_FOUND;
                        }
+
+                       /* Set override flag according to caller */
+
+                       if (flags & ACPI_NS_OVERRIDE_IF_FOUND) {
+                               local_flags |= ACPI_NS_OVERRIDE_IF_FOUND;
+                       }
                }
 
                /* Extract one ACPI name from the front of the pathname */