commit 7dbbfac0fc7bbca072885185bf9bbee9e2e40e63
author Jean-Baptiste Queru <jbq@google.com> Thu Feb 23 12:34:02 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 23 12:34:02 2012 -0800
tree 370f409cef0ea8eb6050a16584dff1bb403c5aa3
parent 76ab561b4dd30711d82060d66b599aece0a40878
parent 5d8fd2a0bc059cd07405a372c98617829f8ac378

am 5d8fd2a0: am a71aefc6: am d041bf20: Merge "bionic/x86: fix one potential deadlock in __set_tls()"

* commit '5d8fd2a0bc059cd07405a372c98617829f8ac378':
  bionic/x86: fix one potential deadlock in __set_tls()

libc/arch-x86/bionic/__set_tls.c

diff --git a/libc/arch-x86/bionic/__set_tls.c b/libc/arch-x86/bionic/__set_tls.c
index e5e43b5..7ed4b01 100755
--- a/libc/arch-x86/bionic/__set_tls.c
+++ b/libc/arch-x86/bionic/__set_tls.c
@@ -83,6 +83,7 @@
     if (rc != 0)
     {
         /* could not set thread local area */
+        pthread_mutex_unlock(&_tls_desc_lock);
         return -1;
     }