[1/2] ASoC: snd_soc_dapm_put_volsw: Make sure to always update the DAPM graph
diff mbox

Message ID 1399223826-28522-1-git-send-email-lars@metafoo.de
State Accepted
Commit c9e065c27fe9b81e5d6e7681d77a24f7b9616675
Headers show

Commit Message

Lars-Peter Clausen May 4, 2014, 5:17 p.m. UTC
When using auto-muted controls it may happen that the register value will not
change when changing a control from enabled to disabled (since the control might
be physically disabled due to the auto-muting). We have to make sure to still
update the DAPM graph and disconnect the mixer input.

Fixes: commit 5729507 ("ASoC: dapm: Implement mixer input auto-disable")
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/soc-dapm.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

Comments

Mark Brown May 5, 2014, 7:31 p.m. UTC | #1
On Sun, May 04, 2014 at 07:17:05PM +0200, Lars-Peter Clausen wrote:
> When using auto-muted controls it may happen that the register value will not
> change when changing a control from enabled to disabled (since the control might
> be physically disabled due to the auto-muting). We have to make sure to still
> update the DAPM graph and disconnect the mixer input.

Applied, thanks.

Patch
diff mbox

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 1871dfc..5d54dfc 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2791,22 +2791,19 @@  int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
 	mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
 
 	change = dapm_kcontrol_set_value(kcontrol, val);
-
-	if (reg != SND_SOC_NOPM) {
-		mask = mask << shift;
-		val = val << shift;
-
-		change = snd_soc_test_bits(codec, reg, mask, val);
-	}
-
 	if (change) {
 		if (reg != SND_SOC_NOPM) {
-			update.kcontrol = kcontrol;
-			update.reg = reg;
-			update.mask = mask;
-			update.val = val;
+			mask = mask << shift;
+			val = val << shift;
+
+			if (snd_soc_test_bits(codec, reg, mask, val)) {
+				update.kcontrol = kcontrol;
+				update.reg = reg;
+				update.mask = mask;
+				update.val = val;
+				card->update = &update;
+			}
 
-			card->update = &update;
 		}
 
 		ret = soc_dapm_mixer_update_power(card, kcontrol, connect);