diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:45 +0100 |
| commit | 4b57895522b150966eebcf18f929e1c522d90bb9 (patch) | |
| tree | 0852de7700b4d6dfeb091ad190c0599e32b6df46 /sound/soc/codecs/rt5645.c | |
| parent | 2914b7004b932a7ddee97c026ebafd16ab841320 (diff) | |
| parent | cc76e7def0fa27b5f42aea54e34c96b4bddaf30a (diff) | |
| download | linux-4b57895522b150966eebcf18f929e1c522d90bb9.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound/soc/codecs/rt5645.c')
| -rw-r--r-- | sound/soc/codecs/rt5645.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index c82301484156..5da29374cd1d 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2410,7 +2410,6 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec, default: break; } - codec->dapm.bias_level = level; return 0; } @@ -2521,7 +2520,7 @@ static int rt5645_probe(struct snd_soc_codec *codec) break; } - rt5645_set_bias_level(codec, SND_SOC_BIAS_OFF); + snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); snd_soc_update_bits(codec, RT5645_CHARGE_PUMP, 0x0300, 0x0200); |