diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 16:15:59 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 16:15:59 -0400 |
commit | 5df498a27ab385294fdb7cad19c623d4da94a780 (patch) | |
tree | 6568359e039f589faccf9f9b2f5d9d8e5b0d8c54 /sound | |
parent | 90d561bed9619fc08c31eab9315ebe811d41149a (diff) | |
parent | 9d863b88ec371491e926e0828dbe3d36ead0f6f9 (diff) |
Merge remote-tracking branch 'asoc/topic/ssm2602' into tmp
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/ssm2602.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index f8d30e5f6371..492644e67ace 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c | |||
@@ -561,8 +561,9 @@ static int ssm2602_suspend(struct snd_soc_codec *codec) | |||
561 | 561 | ||
562 | static int ssm2602_resume(struct snd_soc_codec *codec) | 562 | static int ssm2602_resume(struct snd_soc_codec *codec) |
563 | { | 563 | { |
564 | snd_soc_cache_sync(codec); | 564 | struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); |
565 | 565 | ||
566 | regcache_sync(ssm2602->regmap); | ||
566 | ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 567 | ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
567 | 568 | ||
568 | return 0; | 569 | return 0; |