summaryrefslogtreecommitdiffstats
path: root/udrv
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-04 01:32:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-04 01:32:38 +0000
commit40cc40843d88f79b151b7880f33e59a96f4f0182 (patch)
treec187b35ff6e3e03ab165f32a9e942edfa60e00fe /udrv
parentdf61acbd523271cc9b01b81dbbf5c45799bee6b5 (diff)
parent481b0546db69274145ee129d19bb03cce4763c6f (diff)
downloadandroid_system_bt-40cc40843d88f79b151b7880f33e59a96f4f0182.tar.gz
android_system_bt-40cc40843d88f79b151b7880f33e59a96f4f0182.tar.bz2
android_system_bt-40cc40843d88f79b151b7880f33e59a96f4f0182.zip
am 481b0546: Merge "Fix non-standard pthread mutex interactions."
* commit '481b0546db69274145ee129d19bb03cce4763c6f': Fix non-standard pthread mutex interactions.
Diffstat (limited to 'udrv')
-rw-r--r--udrv/ulinux/uipc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/udrv/ulinux/uipc.c b/udrv/ulinux/uipc.c
index 4906ad816..db58a21ae 100644
--- a/udrv/ulinux/uipc.c
+++ b/udrv/ulinux/uipc.c
@@ -210,7 +210,9 @@ static int accept_server_socket(int sfd)
static int uipc_main_init(void)
{
int i;
- const pthread_mutexattr_t attr = PTHREAD_MUTEX_RECURSIVE;
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_init(&attr);
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&uipc_main.mutex, &attr);
BTIF_TRACE_EVENT("### uipc_main_init ###");