OSDN Git Service

ACPICA: Add an error message if the Debugger fails initialization.
authorBob Moore <robert.moore@intel.com>
Wed, 8 Jan 2014 05:44:38 +0000 (13:44 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 8 Jan 2014 14:31:38 +0000 (15:31 +0100)
Previously, only status was returned.

Linux kernel behaviour is not affected as the changes only apply to the
debugger which is currently not shipped in the kernel.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpica/utxfinit.c

index 75efea0..246ef68 100644 (file)
@@ -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)