---

yaml --- r: 322893 b: refs/heads/master c: 4e872a4 h: refs/heads/master i: 322891: afe4a90 v: v3
git-mirror · Aug 25, 2012 · 76f9f8f · 76f9f8f
1 parent 197de3d
commit 76f9f8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8c3bb911f5afc32f7276c2e2e89eb58af4306ae
+refs/heads/master: 4e872a46823c64e655d997e1e04a4b32e326aa1b
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
@@ -293,8 +293,9 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
 								  level);
 		else
 			dapm->bias_level = level;
-	} else
+	} else if (!card || dapm != &card->dapm) {
 		dapm->bias_level = level;
+	}
 
 	if (ret != 0)
 		goto out;