commit f86d966bff8f2f8972af5847eee7fc3b0235e17f
author Jean-Michel Trivi <jmtrivi@google.com> Tue Oct 13 04:00:12 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 13 04:00:12 2015 +0000
tree 3709dce306186dc8d5f786c2e5e18cc1b32d3684
parent 326563eae449498667b1a924260fe5283feb629e
parent dbdc202db4eb5e4b68196b40a9285c3e398b6a84

am dbdc202d: am c0750690: Configure platform msm8960

* commit 'dbdc202db4eb5e4b68196b40a9285c3e398b6a84':
  Configure platform msm8960

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 9b5a095..bdfa92c 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -841,8 +841,14 @@
         break;
     }
 
-    ALOGV("%s: pcm_prepare start", __func__);
-    pcm_prepare(in->pcm);
+    ALOGV("%s: pcm_prepare", __func__);
+    ret = pcm_prepare(in->pcm);
+    if (ret < 0) {
+        ALOGE("%s: pcm_prepare returned %d", __func__, ret);
+        pcm_close(in->pcm);
+        in->pcm = NULL;
+        goto error_open;
+    }
 
     audio_extn_perf_lock_release();
 
@@ -1200,10 +1206,16 @@
             }
             break;
         }
-        ALOGV("%s: pcm_prepare start", __func__);
-        if (pcm_is_ready(out->pcm))
-            pcm_prepare(out->pcm);
-
+        ALOGV("%s: pcm_prepare", __func__);
+        if (pcm_is_ready(out->pcm)) {
+            ret = pcm_prepare(out->pcm);
+            if (ret < 0) {
+                ALOGE("%s: pcm_prepare returned %d", __func__, ret);
+                pcm_close(out->pcm);
+                out->pcm = NULL;
+                goto error_open;
+            }
+        }
     } else {
         out->pcm = NULL;
         out->compr = compress_open(adev->snd_card, out->pcm_device_id,