commit a610358a4d422872c193cb30b4cd45c10b541a0c
author qctecmdr <qctecmdr@localhost> Tue Sep 17 00:48:35 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 17 00:48:35 2019 -0700
tree 81b0e07f4cc285a2a8553380b3f823a1f90fda0b
parent 21d9894de4241a8fbde45019ed796841b4353647
parent 8987cd7a5d53ce50989766a854b1196a7807082a

Merge "hal: kw fix for address pntr check in auto hal"

hal/audio_extn/auto_hal.c

diff --git a/hal/audio_extn/auto_hal.c b/hal/audio_extn/auto_hal.c
index 0269e81..b09a9d0 100644
--- a/hal/audio_extn/auto_hal.c
+++ b/hal/audio_extn/auto_hal.c
@@ -158,11 +158,11 @@
                                                 sources->ext.device.address);
         } else {
             address = (char *)calloc(1, 1);
-            if (address == NULL) {
-                ALOGE("%s: failed to get address",__func__);
-                ret = -EFAULT;
-                goto error;
-            }
+        }
+        if (address == NULL) {
+            ALOGE("%s: failed to get address",__func__);
+            ret = -EFAULT;
+            goto exit;
         }
         parms = str_parms_create_str(address);
         if (!parms) {
@@ -197,11 +197,11 @@
                                                 sinks->ext.device.address);
         } else {
             address = (char *)calloc(1, 1);
-            if (address == NULL) {
-                ALOGE("%s: failed to get address",__func__);
-                ret = -EFAULT;
-                goto error;
-            }
+        }
+        if (address == NULL) {
+            ALOGE("%s: failed to get address",__func__);
+            ret = -EFAULT;
+            goto exit;
         }
         parms = str_parms_create_str(address);
         if (!parms) {