diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-11-18 18:57:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-11-18 18:57:41 +0100 |
| commit | 547a4a6a96d059d57a475e1ab51058a1f230f7fd (patch) | |
| tree | a2d1aea905872bf49ec5f0b566a78f140c9f7b64 /sound/soc/sof/control.c | |
| parent | ALSA: hda/realtek: Fix LED on HP ProBook 435 G7 (diff) | |
| parent | ASoC: stm32: i2s: fix 32 bits channel length without mclk (diff) | |
| download | linux-547a4a6a96d059d57a475e1ab51058a1f230f7fd.tar.xz linux-547a4a6a96d059d57a475e1ab51058a1f230f7fd.zip | |
Merge tag 'asoc-fix-v5.16-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.16
A relatively large collection of fixes that came in since the merge
window, though a lot of this is just a collection of new machine quirks
for x86 platforms.
Diffstat (limited to 'sound/soc/sof/control.c')
| -rw-r--r-- | sound/soc/sof/control.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) { |