commit 611b903ca7ba9d604a9e2ebc1efa5a66f7ccc049
author Elliott Hughes <enh@google.com> Wed Dec 18 17:56:22 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 18 17:56:22 2013 +0000
tree aacd4f90033fe14a9689caace700b9ed19af0a6b
parent e00f4890c71e9c9eb715faf2c7443732b2fdfae3
parent 4fae14f3335375714be3104742fa69fe65b02001

Merge "Properly detect timeout in pthread_mutex_lock_timeout_np_impl"

libc/bionic/pthread_mutex.cpp

diff --git a/libc/bionic/pthread_mutex.cpp b/libc/bionic/pthread_mutex.cpp
index 8eaf95f..11a66ab 100644
--- a/libc/bionic/pthread_mutex.cpp
+++ b/libc/bionic/pthread_mutex.cpp
@@ -783,7 +783,7 @@
          * thread.
          */
         if (MUTEX_STATE_BITS_IS_LOCKED_CONTENDED(mvalue)) {
-            if (__futex_wait_ex(&mutex->value, shared, mvalue, &ts) == ETIMEDOUT) {
+            if (__futex_wait_ex(&mutex->value, shared, mvalue, &ts) == (-ETIMEDOUT)) {
                 return EBUSY;
             }
             mvalue = mutex->value;