From 76f9f8f11edf4e19dce67778ce6384f80ac027fe Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 23 Aug 2012 18:20:49 +0100
Subject: [PATCH] --- yaml --- r: 322893 b: refs/heads/master c:
 4e872a46823c64e655d997e1e04a4b32e326aa1b h: refs/heads/master i:   322891:
 afe4a908117eb9d5f25ab9de0a8ff62dee067c01 v: v3

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

diff --git a/[refs] b/[refs]
index ff1b9cd47f03..61e2156af5ca 100644
--- 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
index 145ec4b56ca9..f90139b5f50d 100644
--- 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;