commit 008b500b60febfa8eb7baa9d1e491494ee27c02f
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 15 01:28:14 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 15 01:28:14 2015 -0700
tree 2fa08f63fff57cefbeb6c98bc1b8748f57c24311
parent f57a1d460b63b13bdca5354e5ecefa08a6e2ebef
parent b9bf50f6d1e68dc1326ba9090e9d3ad4b96c42ce

Merge "post_proc: Fix for KW reported P1 issues"

post_proc/effect_api.c

diff --git a/post_proc/effect_api.c b/post_proc/effect_api.c
index c850fa5..e15db17 100644
--- a/post_proc/effect_api.c
+++ b/post_proc/effect_api.c
@@ -114,7 +114,7 @@
         return -EINVAL;
     } else {
         *ctl = mixer_get_ctl_by_name(*mixer, mixer_string);
-        if (!ctl) {
+        if (!(*ctl)) {
             ALOGE("mixer_get_ctl_by_name failed");
             mixer_close(*mixer);
             *mixer = NULL;
@@ -968,6 +968,11 @@
     uint32_t i;
 
     ALOGV("%s", __func__);
+    if (!ctl) {
+        ALOGE("%s: ctl is NULL, return invalid", __func__);
+        return -EINVAL;
+    }
+
     if (param_send_flags & OFFLOAD_SEND_HPX_STATE_OFF) {
         *p_param_values++ = DTS_EAGLE_MODULE_ENABLE;
         *p_param_values++ = 0; /* hpx off*/
@@ -976,7 +981,7 @@
         *p_param_values++ = 1; /* hpx on*/
     }
 
-    if ((mode == OFFLOAD) && ctl)
+    if (mode == OFFLOAD)
         mixer_ctl_set_array(ctl, param_values, ARRAY_SIZE(param_values));
     else {
         if (ioctl(*(int *)ctl, AUDIO_EFFECTS_SET_PP_PARAMS, param_values) < 0)