diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2022-06-23 11:51:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-21 21:24:39 +0200 |
| commit | 66cc34f2e493b55fe3455848f275f8ee91a04ac8 (patch) | |
| tree | 70d3976f85ef8420ef9bc1574a7ed719397dab19 /sound | |
| parent | 74ead64cbf0d3cd22c2e010bdb1d0c19abf66ca9 (diff) | |
| download | linux-stable-66cc34f2e493b55fe3455848f275f8ee91a04ac8.tar.gz linux-stable-66cc34f2e493b55fe3455848f275f8ee91a04ac8.tar.bz2 linux-stable-66cc34f2e493b55fe3455848f275f8ee91a04ac8.zip | |
ASoC: madera: Fix event generation for OUT1 demux
[ Upstream commit e3cabbef3db8269207a6b8808f510137669f8deb ]
madera_out1_demux_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: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623105120.1981154-4-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/madera.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c index f4ed7e04673f..d3e7a591b5a8 100644 --- a/sound/soc/codecs/madera.c +++ b/sound/soc/codecs/madera.c @@ -618,7 +618,13 @@ int madera_out1_demux_put(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; } EXPORT_SYMBOL_GPL(madera_out1_demux_put); |