Skip to content

Commit 781118b

Browse files
rfvirgilbroonie
authored andcommitted
ASoC: wm_adsp: Fix missing locking in wm_adsp_[read|write]_ctl()
wm_adsp_read_ctl() and wm_adsp_write_ctl() must hold the cs_dsp pwr_lock mutex when calling cs_dsp_coeff_read_ctrl() and cs_dsp_coeff_write_ctrl(). Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Link: https://lore.kernel.org/r/20230913160250.3700346-1-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 69343ce commit 781118b

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

sound/soc/codecs/wm_adsp.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,10 @@ int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type,
687687
struct wm_coeff_ctl *ctl;
688688
int ret;
689689

690+
mutex_lock(&dsp->cs_dsp.pwr_lock);
690691
ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, buf, len);
692+
mutex_unlock(&dsp->cs_dsp.pwr_lock);
693+
691694
if (ret < 0)
692695
return ret;
693696

@@ -703,8 +706,14 @@ EXPORT_SYMBOL_GPL(wm_adsp_write_ctl);
703706
int wm_adsp_read_ctl(struct wm_adsp *dsp, const char *name, int type,
704707
unsigned int alg, void *buf, size_t len)
705708
{
706-
return cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg),
707-
0, buf, len);
709+
int ret;
710+
711+
mutex_lock(&dsp->cs_dsp.pwr_lock);
712+
ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg),
713+
0, buf, len);
714+
mutex_unlock(&dsp->cs_dsp.pwr_lock);
715+
716+
return ret;
708717
}
709718
EXPORT_SYMBOL_GPL(wm_adsp_read_ctl);
710719

0 commit comments

Comments
 (0)