commit 0fc1b3b13ed5f2a54a62bd7c429d54abbeae4e64
author Haynes Mathew George <hgeorge@codeaurora.org> Mon Aug 01 19:29:27 2016 -0700
committer gitbuildkicker <android-build@google.com> Wed Aug 03 16:19:14 2016 -0700
tree 7eaabc487905ff6eeb3637d2f8bb1b0906760e1d
parent 0d3637a0b05a870c7354b080a5fd9a5e25d2ed1f

audio: RT streams cleanup on error

Do proper cleanup for RT streams if start fails on
these streams. Returning error from start_*_stream
does not guarantee stream will be put to standby

Bug: 30388410
Change-Id: Icbb2c6cfff95eaf4de59626b89b1c99f9090b2a3

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 1a77278..a96a509 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1098,10 +1098,16 @@
         in->pcm = NULL;
         goto error_open;
     }
-    register_in_stream(in);
     if (in->realtime) {
         ret = pcm_start(in->pcm);
+        if (ret < 0) {
+            ALOGE("%s: RT pcm_start failed ret %d", __func__, ret);
+            pcm_close(in->pcm);
+            in->pcm = NULL;
+            goto error_open;
+        }
     }
+    register_in_stream(in);
     audio_extn_perf_lock_release();
     ALOGV("%s: exit", __func__);
 
@@ -1503,10 +1509,16 @@
             adev->offload_effects_start_output(out->handle, out->pcm_device_id);
     }
     ret = 0;
-    register_out_stream(out);
     if (out->realtime) {
         ret = pcm_start(out->pcm);
+        if (ret < 0) {
+            ALOGE("%s: RT pcm_start failed ret %d", __func__, ret);
+            pcm_close(out->pcm);
+            out->pcm = NULL;
+            goto error_open;
+        }
     }
+    register_out_stream(out);
     audio_extn_perf_lock_release();
     ALOGV("%s: exit", __func__);
     return ret;