From: Mark Brown <broonie@kernel.org>
Date: Mon, 8 Dec 2014 13:12:14 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/ssm4567', 'asoc/topic/sta32x', 'asoc/topic... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cabad441830005a4c656812915b0e803d5a65d30;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branches 'asoc/topic/ssm4567', 'asoc/topic/sta32x', 'asoc/topic/sta350', 'asoc/topic/sta529' and 'asoc/topic/stac9766' into asoc-next
---

cabad441830005a4c656812915b0e803d5a65d30
diff --cc sound/soc/codecs/stac9766.c
index f37a79ec45e6,53b810d23fea,53b810d23fea,53b810d23fea,53b810d23fea,6c62d291cde7..dbff0c89be48
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@@@@@@ -258,26 -254,25 -254,25 -254,25 -254,25 -254,19 +258,20 @@@@@@@ static int stac9766_reset(struct snd_so
      	return 0;
      }
      
----- static int stac9766_codec_suspend(struct snd_soc_codec *codec)
----- {
----- 	stac9766_set_bias_level(codec, SND_SOC_BIAS_OFF);
----- 	return 0;
----- }
----- 
      static int stac9766_codec_resume(struct snd_soc_codec *codec)
      {
 +++++	struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
      	u16 id, reset;
      
      	reset = 0;
      	/* give the codec an AC97 warm reset to start the link */
      reset:
      	if (reset > 5) {
----- 		printk(KERN_ERR "stac9766 failed to resume");
+++++ 		dev_err(codec->dev, "Failed to resume\n");
      		return -EIO;
      	}
 -----	codec->ac97->bus->ops->warm_reset(codec->ac97);
 -----	id = soc_ac97_ops->read(codec->ac97, AC97_VENDOR_ID2);
 +++++	ac97->bus->ops->warm_reset(ac97);
 +++++	id = soc_ac97_ops->read(ac97, AC97_VENDOR_ID2);
      	if (id != 0x4c13) {
      		stac9766_reset(codec, 0);
      		reset++;