Unverified Commit 71b5ab96 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm5102: Fix event generation for output compensation 



The output compensation controls always returns zero regardless of if
the control value was updated. This results in missing notifications
to user-space of the control change. Update the handling to return 1
when the value is changed.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220628153409.3266932-1-ckeepax@opensource.cirrus.com


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

sound/soc/codecs/wm5102.c

+17 −4
Original line number Diff line number Diff line
@@ -680,12 +680,17 @@ static int wm5102_out_comp_coeff_put(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);

	struct arizona *arizona = dev_get_drvdata(component->dev->parent);

	uint16_t dac_comp_coeff = get_unaligned_be16(ucontrol->value.bytes.data);

	int ret = 0;



	mutex_lock(&arizona->dac_comp_lock);

	arizona->dac_comp_coeff = get_unaligned_be16(ucontrol->value.bytes.data);

	if (arizona->dac_comp_coeff != dac_comp_coeff) {

		arizona->dac_comp_coeff = dac_comp_coeff;

		ret = 1;

	}

	mutex_unlock(&arizona->dac_comp_lock);



	return 0;

	return ret;

}



static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol,
@@ -706,12 +711,20 @@ static int wm5102_out_comp_switch_put(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);

	struct arizona *arizona = dev_get_drvdata(component->dev->parent);

	struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value;

	int ret = 0;



	if (ucontrol->value.integer.value[0] > mc->max)

		return -EINVAL;



	mutex_lock(&arizona->dac_comp_lock);

	if (arizona->dac_comp_enabled != ucontrol->value.integer.value[0]) {

		arizona->dac_comp_enabled = ucontrol->value.integer.value[0];

		ret = 1;

	}

	mutex_unlock(&arizona->dac_comp_lock);



	return 0;

	return ret;

}



static const char * const wm5102_osr_text[] = {