---

yaml --- r: 248305 b: refs/heads/master c: a68b38a h: refs/heads/master i: 248303: cac388c v: v3
git-mirror · Apr 20, 2011 · 3b1ca0d · 3b1ca0d
1 parent 4797c86
commit 3b1ca0d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a32955dba2e2629bddacf7c1b9de3bf1b7c56acf
+refs/heads/master: a68b38ada57bc9aeeec574d3e76e67ad89fea303
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
@@ -2403,6 +2403,12 @@ int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm,
 			return w->connected;
 	}
 
+	/* Try again in other contexts */
+	list_for_each_entry(w, &dapm->card->widgets, list) {
+		if (!strcmp(w->name, pin))
+			return w->connected;
+	}
+
 	return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_get_pin_status);