summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 21:15:59 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 21:15:59 +0100
commit5df498a27ab385294fdb7cad19c623d4da94a780 (patch)
tree6568359e039f589faccf9f9b2f5d9d8e5b0d8c54 /sound
parent90d561bed9619fc08c31eab9315ebe811d41149a (diff)
parent9d863b88ec371491e926e0828dbe3d36ead0f6f9 (diff)
downloadop-kernel-dev-5df498a27ab385294fdb7cad19c623d4da94a780.zip
op-kernel-dev-5df498a27ab385294fdb7cad19c623d4da94a780.tar.gz
Merge remote-tracking branch 'asoc/topic/ssm2602' into tmp
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/ssm2602.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index f8d30e5..492644e 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)
static int ssm2602_resume(struct snd_soc_codec *codec)
{
- snd_soc_cache_sync(codec);
+ struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);
+ regcache_sync(ssm2602->regmap);
ssm2602_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
OpenPOWER on IntegriCloud