diff options
| author | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
| commit | 2927e6d398d0fca52d8f011a89dcfcabb2b1abfd (patch) | |
| tree | 30ddd4cddded855db423c290512d7be7c13dc9db /sound/soc/codecs/wm_adsp.c | |
| parent | 6395a6213b8367bb55c3b940f663eda772d7c19c (diff) | |
| parent | b976a5adf32eee7db928b5b77cffa3b008ebf2ff (diff) | |
| download | linux-2927e6d398d0fca52d8f011a89dcfcabb2b1abfd.tar.bz2 | |
Merge branch 'asoc-5.11' into asoc-5.12
Diffstat (limited to 'sound/soc/codecs/wm_adsp.c')
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 1fc7bc1970ea..262c2db4f81c 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -2033,11 +2033,14 @@ static struct wm_coeff_ctl *wm_adsp_get_ctl(struct wm_adsp *dsp, unsigned int alg) { struct wm_coeff_ctl *pos, *rslt = NULL; + const char *fw_txt = wm_adsp_fw_text[dsp->fw]; list_for_each_entry(pos, &dsp->ctl_list, list) { if (!pos->subname) continue; if (strncmp(pos->subname, name, pos->subname_len) == 0 && + strncmp(pos->fw_name, fw_txt, + SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == 0 && pos->alg_region.alg == alg && pos->alg_region.type == type) { rslt = pos; |