diff options
| author |   Charles Keepax <ckeepax@opensource.cirrus.com> | 2022-06-28 16:34:08 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-07-07 17:16:27 +0100 |
| commit | 870d72ab9228575b2f005c9a23ea08787e0f63e6 (patch) | |
| tree | 55b32708072c19746026cb4a8defb31299a28af6 /sound/soc/codecs/cs47l92.c | |
| parent | ASoC: wm8998: Fix event generation for input mux (diff) | |
| download | linux-dev-870d72ab9228575b2f005c9a23ea08787e0f63e6.tar.xz linux-dev-870d72ab9228575b2f005c9a23ea08787e0f63e6.zip | |
ASoC: cs47l92: Fix event generation for OUT1 demux
cs47l92_put_demux 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: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220628153409.3266932-3-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | sound/soc/codecs/cs47l92.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c index a1b8dcdb9f7b..444026b7d54b 100644 --- a/sound/soc/codecs/cs47l92.c +++ b/sound/soc/codecs/cs47l92.c @@ -119,7 +119,13 @@ static int cs47l92_put_demux(struct snd_kcontrol *kcontrol, end: snd_soc_dapm_mutex_unlock(dapm); - return snd_soc_dapm_mux_update_power(dapm, kcontrol, mux, e, NULL); + ret = snd_soc_dapm_mux_update_power(dapm, kcontrol, mux, e, NULL); + if (ret < 0) { + dev_err(madera->dev, "Failed to update demux power state: %d\n", ret); + return ret; + } + + return change; } static SOC_ENUM_SINGLE_DECL(cs47l92_outdemux_enum, |