Merge branches 'acpi-pci' and 'pm-pci'

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

diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 37b8b58fcd565e563879f331be4cf983ae4c9f5f..ce406e39b669cd336b95b7b39c73dfa1c317b361 100644 (file)
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -108,6 +108,21 @@ acpi_status acpi_ut_mutex_initialize(void)
        /* Create the reader/writer lock for namespace access */
 
        status = acpi_ut_create_rw_lock(&acpi_gbl_namespace_rw_lock);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+#ifdef ACPI_DEBUGGER
+
+       /* Debugger Support */
+
+       status = acpi_os_create_mutex(&acpi_gbl_db_command_ready);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+
+       status = acpi_os_create_mutex(&acpi_gbl_db_command_complete);
+#endif
+
        return_ACPI_STATUS(status);
 }
 
@@ -147,6 +162,12 @@ void acpi_ut_mutex_terminate(void)
        /* Delete the reader/writer lock */
 
        acpi_ut_delete_rw_lock(&acpi_gbl_namespace_rw_lock);
+
+#ifdef ACPI_DEBUGGER
+       acpi_os_delete_mutex(acpi_gbl_db_command_ready);
+       acpi_os_delete_mutex(acpi_gbl_db_command_complete);
+#endif
+
        return_VOID;
 }