aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-dapm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 88461310dc96..5cfc90941e49 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -148,8 +148,12 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev,
148 148
149 if (card->set_bias_level) 149 if (card->set_bias_level)
150 ret = card->set_bias_level(card, level); 150 ret = card->set_bias_level(card, level);
151 if (ret == 0 && codec->set_bias_level) 151 if (ret == 0) {
152 ret = codec->set_bias_level(codec, level); 152 if (codec->set_bias_level)
153 ret = codec->set_bias_level(codec, level);
154 else
155 codec->bias_level = level;
156 }
153 157
154 return ret; 158 return ret;
155} 159}