Unverified Commit 7406bdbc authored by Simon Trimmer's avatar Simon Trimmer Committed by Mark Brown
Browse files

ASoC: wm_adsp: Return whether changed when writing controls 



Functions that update cs_dsp controls need to handle return codes that
indicate whether the control value changed. A return code of 1 indicates
a change, 0 indicates no-change and a negative value is an error
condition.

Acked controls implicitly change value when written so a successful
write shall always report that the value changed.

Signed-off-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221123165811.3014472-3-rf@opensource.cirrus.com


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

sound/soc/codecs/wm_adsp.c

+18 −9
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/regmap.h>

#include <linux/regulator/consumer.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>

#include <linux/workqueue.h>

#include <linux/debugfs.h>

#include <sound/core.h>
@@ -419,16 +420,21 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl, 
		(struct soc_bytes_ext *)kctl->private_value;

	struct wm_coeff_ctl *ctl = bytes_ext_to_ctl(bytes_ext);

	struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;

	void *scratch;

	int ret = 0;



	mutex_lock(&cs_ctl->dsp->pwr_lock);

	scratch = vmalloc(size);

	if (!scratch)

		return -ENOMEM;



	if (copy_from_user(cs_ctl->cache, bytes, size))

	if (copy_from_user(scratch, bytes, size)) {

		ret = -EFAULT;

	else

		ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, cs_ctl->cache, size);



	} else {

		mutex_lock(&cs_ctl->dsp->pwr_lock);

		ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, scratch, size);

		mutex_unlock(&cs_ctl->dsp->pwr_lock);

	}

	vfree(scratch);



	return ret;

}
@@ -455,7 +461,10 @@ static int wm_coeff_put_acked(struct snd_kcontrol *kctl, 


	mutex_unlock(&cs_ctl->dsp->pwr_lock);



	if (ret < 0)

		return ret;



	return 1;

}



static int wm_coeff_get(struct snd_kcontrol *kctl,
@@ -682,10 +691,10 @@ int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type, 
	int ret;



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

	if (ret)

	if (ret < 0)

		return ret;



	if (cs_ctl->flags & WMFW_CTL_FLAG_SYS)

	if (ret == 0 || (cs_ctl->flags & WMFW_CTL_FLAG_SYS))

		return 0;



	ctl = cs_ctl->priv;