From 364d182b87fbeb643dfcc2ce32ab71b02d189469 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 19 Aug 2009 14:18:53 +0100 Subject: [PATCH] --- yaml --- r: 157677 b: refs/heads/master c: 474e09ca017bd0f6e9bf41af643364a21bc27f43 h: refs/heads/master i: 157675: 0d0f4502c70db3dfc8cf8d67d856f45de13033aa v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-dapm.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aa04a4654435..89cf127e3d1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1a5e44b89b35c88f8908f2b1774201704460f36 +refs/heads/master: 474e09ca017bd0f6e9bf41af643364a21bc27f43 diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c index 88461310dc96..5cfc90941e49 100644 --- a/trunk/sound/soc/soc-dapm.c +++ b/trunk/sound/soc/soc-dapm.c @@ -148,8 +148,12 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev, if (card->set_bias_level) ret = card->set_bias_level(card, level); - if (ret == 0 && codec->set_bias_level) - ret = codec->set_bias_level(codec, level); + if (ret == 0) { + if (codec->set_bias_level) + ret = codec->set_bias_level(codec, level); + else + codec->bias_level = level; + } return ret; }