.....FIXES to many commits

Author: marcinszkudlinski

src/audio/buffers/audio_buffer.c

@@ -82,15 +82,30 @@ int audio_buffer_sync_secondary_buffer(struct sof_audio_buffer *buffer, size_t l
 
 #endif /* CONFIG_PIPELINE_2_0 */
 
-void audio_buffer_free(struct sof_audio_buffer *buffer)
+int audio_buffer_free(struct sof_audio_buffer *buffer)
 {
+	int ret;
+
+	/* free of NULL is allowed */
 	if (!buffer)
-		return;
+		return 0;
 
 	CORE_CHECK_STRUCT(buffer);
+
+	/* cannot free buffer if any of APIs is still connected */
+	if ((sink_get_bound_module(&buffer->_sink_api)) ||
+	   (source_get_bound_module(&buffer->_source_api)))
+	   return -EINVAL;
+
 #if CONFIG_PIPELINE_2_0
-	audio_buffer_free(buffer->secondary_buffer_sink);
-	audio_buffer_free(buffer->secondary_buffer_source);
+	ret = audio_buffer_free(buffer->secondary_buffer_sink);
+	if (ret)
+		return ret;
+
+	ret = audio_buffer_free(buffer->secondary_buffer_source);
+	if (ret)
+		return ret;
+
 #endif /* CONFIG_PIPELINE_2_0 */
 	if (buffer->ops->free)
 		buffer->ops->free(buffer);

src/audio/module_adapter/module/generic.c

@@ -520,14 +520,14 @@ int module_unbind(struct processing_module *mod, struct unbind_info *unbind_data
 	int ret;
 	const struct module_interface *const ops = mod->dev->drv->adapter_ops;
 
-	if (bind_data->from_sink) {
-		ret = sink_unbind(bind_data->from_sink);
+	if (unbind_data->from_sink) {
+		ret = sink_unbind(unbind_data->from_sink);
 		if (ret)
 			return ret;
 	}
 
-	if (bind_data->from_source) {
-		ret = source_unbind(bind_data->from_source);
+	if (unbind_data->from_source) {
+		ret = source_unbind(unbind_data->from_source);
 		if (ret)
 			return ret;
 	}

src/include/sof/audio/audio_buffer.h

@@ -294,7 +294,7 @@ void audio_buffer_init(struct sof_audio_buffer *buffer, uint32_t buffer_type, bo
 /**
  * @brief free buffer and all allocated resources
  */
-void audio_buffer_free(struct sof_audio_buffer *buffer);
+int audio_buffer_free(struct sof_audio_buffer *buffer);
 
 /**
  * @brief clean all buffer data, set buffer positions to initial, leaving config as is

src/include/sof/audio/module_adapter/module/generic.h

@@ -204,8 +204,8 @@ int module_set_configuration(struct processing_module *mod,
 			     enum module_cfg_fragment_position pos, size_t data_offset_size,
 			     const uint8_t *fragment, size_t fragment_size, uint8_t *response,
 			     size_t response_size);
-int module_bind(struct processing_module *mod, void *data);
-int module_unbind(struct processing_module *mod, void *data);
+int module_bind(struct processing_module *mod, struct bind_info *bind_data);
+int module_unbind(struct processing_module *mod, struct unbind_info *unbind_data);
 
 struct comp_dev *module_adapter_new(const struct comp_driver *drv,
 				    const struct comp_ipc_config *config, const void *spec);