ACPICA: Namespace: Add support to allow overriding objects

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

diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 4a9d4a66016e51eefcb851979489bb871edab2a2..47fbe5b335247c97b7a12a1f2e430f49adde2ee6 100644 (file)
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -325,8 +325,26 @@ acpi_ns_search_and_enter(u32 target_name,
                 * If we found it AND the request specifies that a find is an error,
                 * return the error
                 */
-               if ((status == AE_OK) && (flags & ACPI_NS_ERROR_IF_FOUND)) {
-                       status = AE_ALREADY_EXISTS;
+               if (status == AE_OK) {
+
+                       /* The node was found in the namespace */
+
+                       /*
+                        * If the namespace override feature is enabled for this node,
+                        * delete any existing node. This can only happen during the
+                        * boot stage, thus it is safe to remove the node here.
+                        */
+                       if (flags & ACPI_NS_OVERRIDE_IF_FOUND) {
+                               acpi_ns_delete_children(*return_node);
+                               acpi_ns_remove_node(*return_node);
+                               *return_node = ACPI_ENTRY_NOT_FOUND;
+                       }
+
+                       /* Return an error if we don't expect to find the object */
+
+                       else if (flags & ACPI_NS_ERROR_IF_FOUND) {
+                               status = AE_ALREADY_EXISTS;
+                       }
                }
 #ifdef ACPI_ASL_COMPILER
                if (*return_node && (*return_node)->type == ACPI_TYPE_ANY) {