diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 19:03:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 21:47:05 +0100 |
| commit | cc4c670a416a36464443f465f0ddbdc9940d16dd (patch) | |
| tree | f30435a2de6d31256c6269330ae7d6bd8455f309 | |
| parent | d4c6005f8e90da10067c35e1182f533582d01a69 (diff) | |
| download | linux-stable-cc4c670a416a36464443f465f0ddbdc9940d16dd.tar.gz linux-stable-cc4c670a416a36464443f465f0ddbdc9940d16dd.tar.bz2 linux-stable-cc4c670a416a36464443f465f0ddbdc9940d16dd.zip | |
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>
| -rw-r--r-- | sound/soc/soc-dapm.c | 11 |
1 files changed, 7 insertions, 4 deletions
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; |