Merge branch 'for-2.6.26' of git://git.farnsworth.org/dale/linux-2.6-mv643xx_eth...

[linux-2.6-omap-h63xx.git] / drivers / acpi / executer / exmutex.c

diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index 32f24a8fba57e4c812600eb2abe267bc2af1e720..c873ab40cd0ec59835a426d984eb0f261fe6deb6 100644 (file)
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -156,6 +156,10 @@ acpi_ex_acquire_mutex_object(u16 timeout,
 
        ACPI_FUNCTION_TRACE_PTR(ex_acquire_mutex_object, obj_desc);
 
+       if (!obj_desc) {
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
+       }
+
        /* Support for multiple acquires by the owning thread */
 
        if (obj_desc->mutex.thread_id == thread_id) {
@@ -290,6 +294,10 @@ acpi_status acpi_ex_release_mutex_object(union acpi_operand_object *obj_desc)
 
        ACPI_FUNCTION_TRACE(ex_release_mutex_object);
 
+       if (obj_desc->mutex.acquisition_depth == 0) {
+               return (AE_NOT_ACQUIRED);
+       }
+
        /* Match multiple Acquires with multiple Releases */
 
        obj_desc->mutex.acquisition_depth--;
@@ -387,17 +395,22 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
         */
        if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) {
                ACPI_ERROR((AE_INFO,
-                           "Cannot release Mutex [%4.4s], incorrect SyncLevel",
-                           acpi_ut_get_node_name(obj_desc->mutex.node)));
+                           "Cannot release Mutex [%4.4s], SyncLevel mismatch: mutex %d current %d",
+                           acpi_ut_get_node_name(obj_desc->mutex.node),
+                           obj_desc->mutex.sync_level,
+                           walk_state->thread->current_sync_level));
                return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
        }
 
        status = acpi_ex_release_mutex_object(obj_desc);
 
-       /* Restore the original sync_level */
+       if (obj_desc->mutex.acquisition_depth == 0) {
+
+               /* Restore the original sync_level */
 
-       walk_state->thread->current_sync_level =
-           obj_desc->mutex.original_sync_level;
+               walk_state->thread->current_sync_level =
+                   obj_desc->mutex.original_sync_level;
+       }
        return_ACPI_STATUS(status);
 }