commit fb7b7f0c4765844982afc567a1443f25b2d688c7
author Eric Laurent <elaurent@google.com> Wed Apr 01 23:59:43 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 01 23:59:44 2015 +0000
tree 4a0d6f7b78895abdc21485eaf955449fede66311
parent e0eb8e3363abfb3fda6a113a1955967cc136eaf4
parent 7ad164d51f6c6befed0e76f977c6802f26788d0f

Merge "audio: fix set_parameters return code"

audio/hal/audio_hw.c

diff --git a/audio/hal/audio_hw.c b/audio/hal/audio_hw.c
index f4427b1..21f68a7 100644
--- a/audio/hal/audio_hw.c
+++ b/audio/hal/audio_hw.c
@@ -2812,6 +2812,9 @@
     }
 
     str_parms_destroy(parms);
+
+    if (ret > 0)
+        ret = 0;
     ALOGV("%s: exit: code(%d)", __func__, ret);
     return ret;
 }
@@ -3574,6 +3577,10 @@
     pthread_mutex_unlock(&in->lock);
     pthread_mutex_unlock(&adev->lock_inputs);
     str_parms_destroy(parms);
+
+    if (ret > 0)
+        ret = 0;
+
     ALOGV("%s: exit: status(%d)", __func__, ret);
     return ret;
 }
@@ -4068,6 +4075,10 @@
     }
 
     str_parms_destroy(parms);
+
+    if (ret > 0)
+        ret = 0;
+
     ALOGV("%s: exit with code(%d)", __func__, ret);
     return ret;
 }