---

yaml --- r: 270801 b: refs/heads/master c: 4f4c007 h: refs/heads/master i: 270799: f2f903d v: v3
git-mirror · Oct 8, 2011 · 572f968 · 572f968
1 parent 3dbb0a5
commit 572f968
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1ff89ef3cd6515d378f946db5f3760089bb644e
+refs/heads/master: 4f4c0072228785179d35b2bd9e48081ce9fa51f6
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
@@ -1498,6 +1498,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
 #endif
 
 	card->instantiated = 1;
+	snd_soc_dapm_sync(&card->dapm);
 	mutex_unlock(&card->mutex);
 	return;
 

diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
@@ -1845,6 +1845,13 @@ static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm,
  */
 int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm)
 {
+	/*
+	 * Suppress early reports (eg, jacks syncing their state) to avoid
+	 * silly DAPM runs during card startup.
+	 */
+	if (!dapm->card || !dapm->card->instantiated)
+		return 0;
+
 	return dapm_power_widgets(dapm, SND_SOC_DAPM_STREAM_NOP);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_sync);
-Original file line number
+Diff line change
@@ Expand Up @@
     #endif
     	card->instantiated = 1;
+    	snd_soc_dapm_sync(&card->dapm);
     	mutex_unlock(&card->mutex);
     	return;
@@ Expand Down @@