Unverified Commit 781118bc authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

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: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230913160250.3700346-1-rf@opensource.cirrus.com


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

sound/soc/codecs/wm_adsp.c

+11 −2
Original line number Diff line number Diff line
@@ -687,7 +687,10 @@ int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type, 
	struct wm_coeff_ctl *ctl;

	int ret;



	mutex_lock(&dsp->cs_dsp.pwr_lock);

	ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, buf, len);

	mutex_unlock(&dsp->cs_dsp.pwr_lock);



	if (ret < 0)

		return ret;
@@ -703,8 +706,14 @@ EXPORT_SYMBOL_GPL(wm_adsp_write_ctl); 
int wm_adsp_read_ctl(struct wm_adsp *dsp, const char *name, int type,

		     unsigned int alg, void *buf, size_t len)

{

	return cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg),

	int ret;



	mutex_lock(&dsp->cs_dsp.pwr_lock);

	ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg),

				     0, buf, len);

	mutex_unlock(&dsp->cs_dsp.pwr_lock);



	return ret;

}

EXPORT_SYMBOL_GPL(wm_adsp_read_ctl);