From e3cabbef3db8269207a6b8808f510137669f8deb Mon Sep 17 00:00:00 2001

From: Charles Keepax <ckeepax@opensource.cirrus.com>

Date: Thu, 23 Jun 2022 11:51:18 +0100

Subject: [PATCH] ASoC: madera: Fix event generation for OUT1 demux

Git-commit: e3cabbef3db8269207a6b8808f510137669f8deb

Patch-mainline: v5.19-rc6

References: git-fixes

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>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 sound/soc/codecs/madera.c | 8 +++++++-

 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c

index 272041c6236a..8095a87117cf 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);

-- 

2.35.3