diff options
| author | Mark Brown <broonie@kernel.org> | 2015-05-04 12:50:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-04 12:50:18 +0100 |
| commit | ab303e4a17f07d6ebbf6f1528f89e3c1c248a4e6 (patch) | |
| tree | 73fb5706e01dbe1fab6523693288e3b6f9167bf5 /sound/soc/codecs/max98095.c | |
| parent | 217e0ca9c8623e4fb8b768e738f8e59dc56d3eb6 (diff) | |
| parent | beb9969b8a644991dbfdaf18b9f1161a39a91df8 (diff) | |
| download | talos-op-linux-ab303e4a17f07d6ebbf6f1528f89e3c1c248a4e6.tar.gz talos-op-linux-ab303e4a17f07d6ebbf6f1528f89e3c1c248a4e6.zip | |
Merge branch 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-tas751x
Diffstat (limited to 'sound/soc/codecs/max98095.c')
| -rw-r--r-- | sound/soc/codecs/max98095.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 8fba0c3db798..66c7ca431a2e 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -1678,7 +1678,6 @@ static int max98095_set_bias_level(struct snd_soc_codec *codec, regcache_mark_dirty(max98095->regmap); break; } - codec->dapm.bias_level = level; return 0; } @@ -2198,7 +2197,7 @@ static int max98095_suspend(struct snd_soc_codec *codec) if (max98095->headphone_jack || max98095->mic_jack) max98095_jack_detect_disable(codec); - max98095_set_bias_level(codec, SND_SOC_BIAS_OFF); + snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); return 0; } @@ -2208,7 +2207,7 @@ static int max98095_resume(struct snd_soc_codec *codec) struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); struct i2c_client *client = to_i2c_client(codec->dev); - max98095_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); if (max98095->headphone_jack || max98095->mic_jack) { max98095_jack_detect_enable(codec); |
