浏览代码

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>
Mark Brown 14 年之前
父节点
当前提交
cc4c670a41
共有 1 个文件被更改,包括 7 次插入4 次删除
  1. 7 4
      sound/soc/soc-dapm.c

+ 7 - 4
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)
 	if (ret != 0)
 		goto out;
 		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)
 	if (ret != 0)
 		goto out;
 		goto out;