commit ca43d11cec1d8afa6b6cfe5a262c0d74b775bb5e
author Kevin Rocard <krocard@google.com> Thu Aug 10 03:02:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 10 03:02:33 2017 +0000
tree e7216d6a17f2fa40444051ce2786797947e25cdc
parent 2e2c78b111030fc5dc988f5e063eb868d77662d7
parent e5a89f5fc43cac1b91f22587a30d744edc1c0c27

Routing to usb was rejected due to incorrect card number am: 1e02c88b8f am: 8c80fab3a1
am: e5a89f5fc4

Change-Id: Ie7b1e7971871e49cb1e4ba36bcd834653508f225

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index e66ad9a..72e5c05 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3939,6 +3939,7 @@
     out->error_log = NULL;
 
     pthread_cond_destroy(&out->cond);
+    pthread_mutex_destroy(&out->pre_lock);
     pthread_mutex_destroy(&out->lock);
     free(stream);
     ALOGV("%s: exit", __func__);
@@ -4484,6 +4485,9 @@
     error_log_destroy(in->error_log);
     in->error_log = NULL;
 
+    pthread_mutex_destroy(&in->pre_lock);
+    pthread_mutex_destroy(&in->lock);
+
     free(stream);
 
     return;
@@ -4651,6 +4655,7 @@
         }
         if (adev->adm_deinit)
             adev->adm_deinit(adev->adm_data);
+        pthread_mutex_destroy(&adev->lock);
         free(device);
     }