From 4599357cc58939b56dd4808b746bfa8097dee26d Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 22 Mar 2010 13:36:13 +0000
Subject: [PATCH] --- yaml --- r: 193368 b: refs/heads/master c:
 5b9e87ccccf77f46c006c2cf0988a66d0f3f310d h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-dapm.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b1dc88f5e3b0..6fae90e0eda2 100644
--- 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
index 611284194000..476dbe6dabad 100644
--- 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;
 		}
 	}