commit d3bc0d753f5b86d5577d6c4f1a52f3eb8869601d
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 28 22:26:19 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 28 22:26:19 2014 -0700
tree b3589367918376ec7066f72b9c4157da581b7446
parent bcfbd1add038859f630b3e024e704c90a1e28162
parent 40703105d84590bd2b49ec4585eb78a5864fbc7f

Merge "hal: Ensure all the mutexes are initialized"

hal/audio_extn/usb.c

diff --git a/hal/audio_extn/usb.c b/hal/audio_extn/usb.c
index 281b445..0240d7c 100644
--- a/hal/audio_extn/usb.c
+++ b/hal/audio_extn/usb.c
@@ -580,6 +580,11 @@
     usbmod->proxy_card = 0;
     usbmod->proxy_device_id = AFE_PROXY_PLAYBACK_DEVICE;
     usbmod->adev = (struct audio_device*)adev;
+
+     pthread_mutex_init(&usbmod->usb_playback_lock,
+                        (const pthread_mutexattr_t *) NULL);
+     pthread_mutex_init(&usbmod->usb_record_lock,
+                        (const pthread_mutexattr_t *) NULL);
 }
 
 void audio_extn_usb_deinit()

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index cf86cc8..ded07f4 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2601,6 +2601,8 @@
 
     in = (struct stream_in *)calloc(1, sizeof(struct stream_in));
 
+    pthread_mutex_init(&in->lock, (const pthread_mutexattr_t *) NULL);
+
     in->stream.common.get_sample_rate = in_get_sample_rate;
     in->stream.common.set_sample_rate = in_set_sample_rate;
     in->stream.common.get_buffer_size = in_get_buffer_size;
@@ -2735,6 +2737,8 @@
 
     adev = calloc(1, sizeof(struct audio_device));
 
+    pthread_mutex_init(&adev->lock, (const pthread_mutexattr_t *) NULL);
+
     adev->device.common.tag = HARDWARE_DEVICE_TAG;
     adev->device.common.version = AUDIO_DEVICE_API_VERSION_2_0;
     adev->device.common.module = (struct hw_module_t *)module;