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

Commit Message

Peter Ujfalusi Nov. 3, 2021, 8:27 a.m. UTC

From: Peter Ujfalusi <[e-mail]>

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

Fixes: 756bbe4205bc6 ("ASoC: SOF: Handle control change notification from firmware")
Signed-off-by: Peter Ujfalusi <[e-mail]>
---
 sound/soc/sof/control.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Ranjani Sridharan Nov. 3, 2021, 10:09 p.m. UTC | #1

On Wed, 2021-11-03 at 10:27 +0200, Peter Ujfalusi wrote:
> From: Peter Ujfalusi <[e-mail]>
> 
> The second parameter for snd_sof_ipc_set_get_comp_data() is ipc_cmd,
> not
> ipc_ctrl_type and the type is u32.
> 
> Fixes: 756bbe4205bc6 ("ASoC: SOF: Handle control change notification
> from firmware")
> Signed-off-by: Peter Ujfalusi <[e-mail]>

Thanks, Peter.

Acked-by: Ranjani Sridharan <[e-mail]>

Mark Brown Nov. 4, 2021, 2:20 p.m. UTC | #2

On Wed, 3 Nov 2021 10:27:10 +0200, Peter Ujfalusi wrote:
> From: Peter Ujfalusi <[e-mail]>
> 
> The second parameter for snd_sof_ipc_set_get_comp_data() is ipc_cmd, not
> ipc_ctrl_type and the type is u32.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus

Thanks!

[1/1] ASoC: SOF:control: Fix variable type in snd_sof_refresh_control()
      commit: d9835eaa3e9fb4770745294fef3f8416446178c0

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Patch

diff --git a/sound/soc/sof/control.c b/sound/soc/sof/control.c
index 58bb89af4de1..bb1dfe4f6d40 100644
--- a/sound/soc/sof/control.c
+++ b/sound/soc/sof/control.c
@@ -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) {