Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2781db30 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "lsm: miscellaneous fixes for multi-stage adsp VA"

parents 81e65923 66ae4136

asoc/msm-lsm-client.c

+2 −2
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ static int msm_lsm_ioctl_shared(struct snd_pcm_substream *substream, 
			break;

		}

		if (copy_from_user(

				prtd->lsm_client->stage_cfg[stage_idx].sound_model.data,

				prtd->lsm_client->stage_cfg[p_info.stage_idx].sound_model.data,

				snd_model_v2.data, snd_model_v2.data_size)) {

			dev_err(rtd->dev,

				"%s: copy from user data failed\n"
@@ -2149,7 +2149,7 @@ static int msm_lsm_ioctl(struct snd_pcm_substream *substream, 


		if (p_data.data_size != p_size) {

			dev_err(rtd->dev,

				"%s: %s: Invalid data_size(%zd) against expected(%zd)\n",

				"%s: %s: Invalid data_size(%u) against expected(%zd)\n",

				__func__, "SET_MODULE_PARAMS(_V2)",

				p_data.data_size, p_size);

			err = -EFAULT;

dsp/q6lsm.c

+3 −2
Original line number Diff line number Diff line
@@ -741,7 +741,8 @@ static int q6lsm_do_open_v3(struct lsm_client *client) 
{

	int rc, app_type;

	struct lsm_stream_cmd_open_tx_v3 *open_v3;

	size_t cmd_size = 0, stage_idx = LSM_STAGE_INDEX_FIRST;

	size_t cmd_size = 0;

	int stage_idx = LSM_STAGE_INDEX_FIRST;

	uint32_t topology_id = 0, *uint32_ptr = NULL;



	cmd_size = sizeof(struct lsm_stream_cmd_open_tx_v3);
@@ -866,7 +867,7 @@ void q6lsm_sm_set_param_data(struct lsm_client *client, 
	param_hdr.module_id = p_info->module_id;

	param_hdr.instance_id = p_info->instance_id;

	param_hdr.param_id = p_info->param_id;

	param_hdr.param_size = sm->size;

	param_hdr.param_size = p_info->param_size;



	ret = q6lsm_pack_params(sm->data, &param_hdr,

				NULL, offset, LSM_SESSION_CMD_SET_PARAMS_V2);