Merge "st-hal: Fixes for PDK5 SSR"
diff --git a/sound_trigger_hw.c b/sound_trigger_hw.c
index 1bb9848..e8c37a9 100644
--- a/sound_trigger_hw.c
+++ b/sound_trigger_hw.c
@@ -749,12 +749,14 @@
unsigned int num_sessions = 0;
struct audio_device_info *item = NULL;
- if (config != NULL) {
- ALOGV("%s: Event type = %d", __func__, event_type);
- list_for_each (node, &config->device_info.devices) {
- item = node_to_item(node, struct audio_device_info, list);
- ALOGV("%s: Audio device = 0x%x", __func__, item->type);
- }
+ if (config == NULL) {
+ ALOGE("%s: Config is NULL, exiting", __func__);
+ return;
+ }
+
+ list_for_each (node, &config->device_info.devices) {
+ item = node_to_item(node, struct audio_device_info, list);
+ ALOGV("%s: Audio device = 0x%x", __func__, item->type);
}
/*
diff --git a/sound_trigger_platform.c b/sound_trigger_platform.c
index cded425..ee7a72c 100644
--- a/sound_trigger_platform.c
+++ b/sound_trigger_platform.c
@@ -2191,22 +2191,24 @@
/* Get the last added vendor_info node */
sm_info_node = list_tail(&my_data->stdev->vendor_uuid_list);
- if (sm_info_node) {
+ if (sm_info_node)
sm_info = node_to_item(sm_info_node, struct st_vendor_info, list_node);
- } else {
+
+ if (!sm_info) {
ALOGE("%s: found NULL sm_info", __func__);
- ret = -EINVAL;
- goto err_exit;
+ free(kv_pairs);
+ return -EINVAL;
}
/* Get the last added lsm_params node */
lsm_params_node = list_tail(&sm_info->lsm_usecase_list);
- if (lsm_params_node) {
+ if (lsm_params_node)
lsm_params = node_to_item(lsm_params_node, struct st_lsm_params, list_node);
- } else {
+
+ if (!lsm_params) {
ALOGE("%s: found NULL lsm_params", __func__);
- ret = -EINVAL;
- goto err_exit;
+ free(kv_pairs);
+ return -EINVAL;
}
err = str_parms_get_str(parms, ST_PARAM_KEY_EXECUTION_MODE,
@@ -2453,8 +2455,7 @@
list_remove(module_node);
free(module_params);
}
- if (lsm_params)
- free(lsm_params);
+ free(lsm_params);
free(kv_pairs);
return ret;
}
diff --git a/st_session.c b/st_session.c
index b96bb03..9533721 100644
--- a/st_session.c
+++ b/st_session.c
@@ -232,7 +232,8 @@
do {
lock_status = pthread_mutex_trylock(&st_ses->lock);
} while (lock_status && !st_ses->det_stc_ses->pending_stop &&
- (st_ses->current_state == buffering_state_fn));
+ (st_ses->current_state == buffering_state_fn) &&
+ !st_ses->stdev->ssr_offline_received);
if (st_ses->det_stc_ses->pending_stop)
ALOGV("%s:[%d] pending stop already queued, ignore event",
@@ -243,6 +244,9 @@
else if (st_ses->current_state != buffering_state_fn)
ALOGV("%s:[%d] session already stopped buffering, ignore event",
__func__, st_ses->sm_handle);
+ else if (st_ses->stdev->ssr_offline_received)
+ ALOGV("%s:[%d] SSR handling in progress, ignore event",
+ __func__, st_ses->sm_handle);
else if (!lock_status)
DISPATCH_EVENT(st_ses, ev, status);