]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: cs47l92: Fix event generation for OUT1 demux
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Tue, 28 Jun 2022 15:34:08 +0000 (16:34 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 7 Jul 2022 16:16:27 +0000 (17:16 +0100)
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>
sound/soc/codecs/cs47l92.c

index a1b8dcdb9f7b7678636be3b0da0f12a24b861773..444026b7d54b3243d393349eb04c704c79e36e24 100644 (file)
@@ -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,