---

yaml --- r: 316279 b: refs/heads/master c: 8a72071 h: refs/heads/master i: 316277: 6dc5d3c 316275: 3470dc2 316271: 1593e52 v: v3
git-mirror · Jun 29, 2012 · f24633a · f24633a
1 parent 95d258e
commit f24633a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adf643aba8ed620f8c8e2533f4ace3a90e5daecf
+refs/heads/master: 8a720718b37d00cf8ab311902705ae7c7890bb95
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
@@ -2515,19 +2515,13 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
 	int wi;
 
 	val = (ucontrol->value.integer.value[0] & mask);
+	connect = !!val;
 
 	if (invert)
 		val = max - val;
 	mask = mask << shift;
 	val = val << shift;
 
-	if (val)
-		/* new connection */
-		connect = invert ? 0 : 1;
-	else
-		/* old connection must be powered down */
-		connect = invert ? 1 : 0;
-
 	mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
 
 	change = snd_soc_test_bits(widget->codec, reg, mask, val);