Unverified Commit 15b2e5d1 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm8998: Fix event generation for input mux 



wm8998_inmux_put returns the value of snd_soc_dapm_mux_update_power,
which returns a 1 if a path was found for the kcontrol. This is
obviously different to the expected return a 1 if the control
was updated value. This results in spurious notifications to
user-space. Update the handling to only return a 1 when the value is
changed.

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


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

sound/soc/codecs/wm8998.c

+14 −7
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static int wm8998_inmux_put(struct snd_kcontrol *kcontrol, 
	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int mode_reg, mode_index;

	unsigned int mux, inmode, src_val, mode_val;

	int change, ret;



	mux = ucontrol->value.enumerated.item[0];

	if (mux > 1)
@@ -137,14 +138,20 @@ static int wm8998_inmux_put(struct snd_kcontrol *kcontrol, 
	snd_soc_component_update_bits(component, mode_reg,

				      ARIZONA_IN1_MODE_MASK, mode_val);



	snd_soc_component_update_bits(component, e->reg,

	change = snd_soc_component_update_bits(component, e->reg,

					       ARIZONA_IN1L_SRC_MASK |

					       ARIZONA_IN1L_SRC_SE_MASK,

					       src_val);



	return snd_soc_dapm_mux_update_power(dapm, kcontrol,

	ret = snd_soc_dapm_mux_update_power(dapm, kcontrol,

					    ucontrol->value.enumerated.item[0],

					    e, NULL);

	if (ret < 0) {

		dev_err(arizona->dev, "Failed to update demux power state: %d\n", ret);

		return ret;

	}



	return change;

}



static const char * const wm8998_inmux_texts[] = {