Merge "st-hal: Update custom config data for merged sound model usecases"
diff --git a/st_session.c b/st_session.c
index 31f415b..46924c7 100644
--- a/st_session.c
+++ b/st_session.c
@@ -2355,11 +2355,12 @@
          * handle here.
          * For now just copy the the current client data which is same
          * across SVA engines.
+         * Update the custom data for the case in which one client session
+         * does not have custom data and another one does.
          */
-        if (!sthw_cfg->custom_data) {
+        if (rc_config->data_size > sthw_cfg->custom_data_size) {
             sthw_cfg->custom_data = (char *)rc_config + rc_config->data_offset;
-            if (rc_config->data_size)
-                sthw_cfg->custom_data_size =  rc_config->data_size;
+            sthw_cfg->custom_data_size =  rc_config->data_size;
         }
 
     } else {