1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c
index 75efea0539c1..246ef68681f4 100644
--- a/drivers/acpi/acpica/utxfinit.c
+++ b/drivers/acpi/acpica/utxfinit.c
@@ -122,8 +122,16 @@ acpi_status __init acpi_initialize_subsystem(void)
 
         /* If configured, initialize the AML debugger */
 
-        ACPI_DEBUGGER_EXEC(status = acpi_db_initialize());
-        return_ACPI_STATUS(status);
+#ifdef ACPI_DEBUGGER
+        status = acpi_db_initialize();
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "During Debugger initialization"));
+                return_ACPI_STATUS(status);
+        }
+#endif
+
+        return_ACPI_STATUS(AE_OK);
 }
 
 ACPI_EXPORT_SYMBOL_INIT(acpi_initialize_subsystem)