1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index 1c9ca6e05314..aec8488c0019 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -557,10 +557,13 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
                 ACPI_EXCEPTION((AE_INFO, status, "during %s._INI execution",
                                 scope_name));
                 ACPI_FREE(scope_name);
-                status = AE_OK;
         }
 #endif
 
+        /* Ignore errors from above */
+
+        status = AE_OK;
+
         /*
          * The _INI method has been run if present; call the Global Initialization
          * Handler for this device.