Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

ASoC: Simplify logic in snd_soc_dapm_set_bias_level()

Browse source 
No functional changes but much less indentation.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
This commit is contained in:
Mark Brown 2011-06-06 18:15:19 +01:00
parent 4113e44316
commit 171ec6b089
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sound/soc/soc-dapm.c
View file

@ -143,17 +143,19 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
if (card && card->set_bias_level) if (card && card->set_bias_level)
ret = card->set_bias_level(card, level); ret = card->set_bias_level(card, level);
if (ret == 0) { if (ret != 0)
if (dapm->codec && dapm->codec->driver->set_bias_level) goto out;
ret = dapm->codec->driver->set_bias_level(dapm->codec, level);
else
dapm->bias_level = level;
}
if (ret == 0) {
if (card && card->set_bias_level_post)
ret = card->set_bias_level_post(card, level);
}
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 (ret != 0)
goto out;
if (card && card->set_bias_level_post)
ret = card->set_bias_level_post(card, level);
out:
trace_snd_soc_bias_level_done(card, level); trace_snd_soc_bias_level_done(card, level);
return ret; return ret;