Merge branch 'linus' into x86/pebs

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index e48a3ea03117..2509809a36cf 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -565,7 +565,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
 
                                 acpi_os_release_mutex(method_desc->method.
                                                       mutex->mutex.os_mutex);
-                                method_desc->method.mutex->mutex.thread_id = 0;
+                                method_desc->method.mutex->mutex.thread_id = NULL;
                         }
                 }