Unverified Commit d9835eaa authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF:control: Fix variable type in snd_sof_refresh_control() 



The second parameter for snd_sof_ipc_set_get_comp_data() is ipc_cmd, not
ipc_ctrl_type and the type is u32.

Fixes: 756bbe42 ("ASoC: SOF: Handle control change notification from firmware")
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@gmail.com>
Acked-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20211103082710.17165-1-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a2697972

sound/soc/sof/control.c

+4 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static void snd_sof_refresh_control(struct snd_sof_control *scontrol) 
{

	struct sof_ipc_ctrl_data *cdata = scontrol->control_data;

	struct snd_soc_component *scomp = scontrol->scomp;

	enum sof_ipc_ctrl_type ctrl_type;

	u32 ipc_cmd;

	int ret;



	if (!scontrol->comp_data_dirty)
@@ -79,9 +79,9 @@ static void snd_sof_refresh_control(struct snd_sof_control *scontrol) 
		return;



	if (scontrol->cmd == SOF_CTRL_CMD_BINARY)

		ctrl_type = SOF_IPC_COMP_GET_DATA;

		ipc_cmd = SOF_IPC_COMP_GET_DATA;

	else

		ctrl_type = SOF_IPC_COMP_GET_VALUE;

		ipc_cmd = SOF_IPC_COMP_GET_VALUE;



	/* set the ABI header values */

	cdata->data->magic = SOF_ABI_MAGIC;
@@ -89,7 +89,7 @@ static void snd_sof_refresh_control(struct snd_sof_control *scontrol) 


	/* refresh the component data from DSP */

	scontrol->comp_data_dirty = false;

	ret = snd_sof_ipc_set_get_comp_data(scontrol, ctrl_type,

	ret = snd_sof_ipc_set_get_comp_data(scontrol, ipc_cmd,

					    SOF_CTRL_TYPE_VALUE_CHAN_GET,

					    scontrol->cmd, false);

	if (ret < 0) {