From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 6 Jun 2011 18:03:34 +0000 (+0100)
Subject: ASoC: Only provide a default bias level update for CODEC contexts
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cc4c670a416a36464443f465f0ddbdc9940d16dd;p=linux-beck.git

ASoC: Only provide a default bias level update for CODEC contexts

This allows the card driver to use the bias level variable more easily in
multi component systems.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
---

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 1682834f8c38..34106bca63cf 100644
--- a/sound/soc/soc-dapm.c
+++ b/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;