Commit 06f3a0a7 authored by Stefan Binding's avatar Stefan Binding Committed by Takashi Iwai
Browse files

ALSA: hda: hda_cs_dsp_ctl: Ensure pwr_lock is held before reading/writing controls 



These apis require the pwr_lock to be held.

Signed-off-by: default avatarStefan Binding <sbinding@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221011143552.621792-3-sbinding@opensource.cirrus.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 49b0dea1

sound/pci/hda/hda_cs_dsp_ctl.c

+11 −2
Original line number Diff line number Diff line
@@ -199,11 +199,14 @@ EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_control_remove, SND_HDA_CS_DSP_CONTROLS); 
int hda_cs_dsp_write_ctl(struct cs_dsp *dsp, const char *name, int type,

			 unsigned int alg, const void *buf, size_t len)

{

	struct cs_dsp_coeff_ctl *cs_ctl = cs_dsp_get_ctl(dsp, name, type, alg);

	struct cs_dsp_coeff_ctl *cs_ctl;

	struct hda_cs_dsp_coeff_ctl *ctl;

	int ret;



	mutex_lock(&dsp->pwr_lock);

	cs_ctl = cs_dsp_get_ctl(dsp, name, type, alg);

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

	mutex_unlock(&dsp->pwr_lock);

	if (ret)

		return ret;
@@ -221,7 +224,13 @@ EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_write_ctl, SND_HDA_CS_DSP_CONTROLS); 
int hda_cs_dsp_read_ctl(struct cs_dsp *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, name, type, alg), 0, buf, len);

	int ret;



	mutex_lock(&dsp->pwr_lock);

	ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(dsp, name, type, alg), 0, buf, len);

	mutex_unlock(&dsp->pwr_lock);



	return ret;



}

EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_read_ctl, SND_HDA_CS_DSP_CONTROLS);