commit 014bae110d2130efde1fa567261c2793517d0665
author Quinn Male <qmale@codeaurora.org> Mon Jul 15 18:28:12 2019 -0700
committer Quinn Male <qmale@codeaurora.org> Mon Jul 29 11:33:28 2019 -0700
tree 8f16eceb71c38605a4e630511b9f795fcfa56af9
parent 2349f3a318acd695751d9651b46a8ae0736e483a

st-hal: Fix double free in merge sound models logic

This change removes a double free of the confidence levels
structure which was causing a failure with repeated
load/start/stop/start usecases for dual VA.

Change-Id: I275925b8dbbdb8f46ad33ed063e5dee611d8a722

st_session.c

diff --git a/st_session.c b/st_session.c
index 31f415b..7bf02d9 100644
--- a/st_session.c
+++ b/st_session.c
@@ -1217,8 +1217,7 @@
     int hb_sz = 0, pr_sz = 0;
     bool active = false, enable_lab = false;
 
-    if (!st_ses->vendor_uuid_info->merge_fs_soundmodels ||
-        !st_ses->sm_info.sm_merged) {
+    if (!st_ses->vendor_uuid_info->merge_fs_soundmodels) {
         if (sthw_cfg->conf_levels) {
             ALOGV("%s: free hw conf_levels", __func__);
             free(sthw_cfg->conf_levels);