Merge remote-tracking branch 'asoc/topic/ssm2602' into tmp

5df498a2 · Mark Brown · 90d561be · 9d863b88 · 5df498a2
Commit 5df498a2 authored Sep 01, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sound/soc/codecs/ssm2602.c sound/soc/codecs/ssm2602.c +2 -1

No files found.
--- 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;