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

* commit 'd041bf2095f5f133c87f7ba632a8dfb39537a437':
  bionic/x86: fix one potential deadlock in __set_tls()
This commit is contained in:
Jean-Baptiste Queru
2012-02-23 12:29:10 -08:00
committed by Android Git Automerger

View File

@@ -83,6 +83,7 @@ int __set_tls(void *ptr)
if (rc != 0)
{
/* could not set thread local area */
pthread_mutex_unlock(&_tls_desc_lock);
return -1;
}