From eaf068c21ca4fb0175c2e59e24c9f7b5c71094c2 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 6 Jun 2011 19:03:34 +0100
Subject: [PATCH] --- yaml --- r: 257499 b: refs/heads/master c:
 cc4c670a416a36464443f465f0ddbdc9940d16dd h: refs/heads/master i:   257497:
 a2cd477e527ce5dd9bc8e00cc6e37a1b2fa5ff9c   257495:
 1af46cd6851a829e9edc47a498b722c62a2ac150 v: v3

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

diff --git a/[refs] b/[refs]
index 0081781c80a1..49134c7ab411 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4c6005f8e90da10067c35e1182f533582d01a69
+refs/heads/master: cc4c670a416a36464443f465f0ddbdc9940d16dd
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
index 1682834f8c38..34106bca63cf 100644
--- a/trunk/sound/soc/soc-dapm.c
+++ b/trunk/sound/soc/soc-dapm.c
@@ -146,10 +146,13 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
 	if (ret != 0)
 		goto out;
 
-	if (dapm->codec && dapm->codec->driver->set_bias_level)
-		ret = dapm->codec->driver->set_bias_level(dapm->codec, level);
-	else
-		dapm->bias_level = level;
+	if (dapm->codec) {
+		if (dapm->codec->driver->set_bias_level)
+			ret = dapm->codec->driver->set_bias_level(dapm->codec,
+								  level);
+		else
+			dapm->bias_level = level;
+	}
 	if (ret != 0)
 		goto out;