From: Mark Brown <broonie@kernel.org>
Date: Fri, 16 Feb 2018 15:29:19 +0000 (+0000)
Subject: Merge branch 'fix/sgtl5000' of https://git.kernel.org/pub/scm/linux/kernel/git/brooni... 
X-Git-Tag: v4.17-rc1~119^2~1^2~18^3~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27a4b3f98ba25923ce1016f8341a382843e3cd79;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'fix/sgtl5000' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000
---

27a4b3f98ba25923ce1016f8341a382843e3cd79
diff --cc sound/soc/codecs/sgtl5000.c
index 975a9d76b37f0,c5c76ab8ccf10..05592ddcf0e69
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@@ -873,19 -873,30 +873,30 @@@ static int sgtl5000_pcm_hw_params(struc
   * stop:
   * on --> prepare --> standby
   */
 -static int sgtl5000_set_bias_level(struct snd_soc_codec *codec,
 +static int sgtl5000_set_bias_level(struct snd_soc_component *component,
  				   enum snd_soc_bias_level level)
  {
 -	struct sgtl5000_priv *sgtl = snd_soc_codec_get_drvdata(codec);
++	struct sgtl5000_priv *sgtl = snd_soc_component_get_drvdata(component);
+ 	int ret;
+ 
  	switch (level) {
  	case SND_SOC_BIAS_ON:
  	case SND_SOC_BIAS_PREPARE:
  	case SND_SOC_BIAS_STANDBY:
+ 		regcache_cache_only(sgtl->regmap, false);
+ 		ret = regcache_sync(sgtl->regmap);
+ 		if (ret) {
+ 			regcache_cache_only(sgtl->regmap, true);
+ 			return ret;
+ 		}
+ 
 -		snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
 +		snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,
  				    SGTL5000_REFTOP_POWERUP,
  				    SGTL5000_REFTOP_POWERUP);
  		break;
  	case SND_SOC_BIAS_OFF:
+ 		regcache_cache_only(sgtl->regmap, true);
 -		snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
 +		snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,
  				    SGTL5000_REFTOP_POWERUP, 0);
  		break;
  	}