1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 23db53ce2293..d70eaf39dfdf 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -110,11 +110,11 @@ acpi_status acpi_ns_root_initialize(void)
                 status = acpi_ns_lookup(NULL, init_val->name, init_val->type,
                                         ACPI_IMODE_LOAD_PASS2,
                                         ACPI_NS_NO_UPSEARCH, NULL, &new_node);
-
-                if (ACPI_FAILURE(status) || (!new_node)) {      /* Must be on same line for code converter */
+                if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
                                         "Could not create predefined name %s",
                                         init_val->name));
+                        continue;
                 }
 
                 /*
@@ -179,8 +179,7 @@ acpi_status acpi_ns_root_initialize(void)
 
                                 /* Build an object around the static string */
 
-                                obj_desc->string.length =
-                                    (u32) ACPI_STRLEN(val);
+                                obj_desc->string.length = (u32)ACPI_STRLEN(val);
                                 obj_desc->string.pointer = val;
                                 obj_desc->common.flags |= AOPOBJ_STATIC_POINTER;
                                 break;