---

yaml --- r: 193368 b: refs/heads/master c: 5b9e87c h: refs/heads/master v: v3
git-mirror · Mar 22, 2010 · 4599357 · 4599357
1 parent 3b27b0e
commit 4599357
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5021ec9fc32edc6f512c2375923d757e9825f6a
+refs/heads/master: 5b9e87ccccf77f46c006c2cf0988a66d0f3f310d
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
@@ -1266,6 +1266,9 @@ static int snd_soc_dapm_set_pin(struct snd_soc_codec *codec,
 		if (!strcmp(w->name, pin)) {
 			pr_debug("dapm: %s: pin %s\n", codec->name, pin);
 			w->connected = status;
+			/* Allow disabling of forced pins */
+			if (status == 0)
+				w->force = 0;
 			return 0;
 		}
 	}