From: Mark Brown <broonie@kernel.org>
Date: Tue, 27 Jan 2015 23:50:47 +0000 (+0000)
Subject: Merge branch 'topic/arizona' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=60d66c9a24907c8c965be4c7d15f67bd9d54b553;p=linux-beck.git

Merge branch 'topic/arizona' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-w-codec
---

60d66c9a24907c8c965be4c7d15f67bd9d54b553
diff --cc sound/soc/codecs/arizona.c
index 65977bc0db19,32bc609f23e4..29202610dd0d
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@@ -735,7 -734,24 +735,25 @@@ int arizona_out_ev(struct snd_soc_dapm_
  		   struct snd_kcontrol *kcontrol,
  		   int event)
  {
 -	struct arizona_priv *priv = snd_soc_codec_get_drvdata(w->codec);
++	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
++	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
+ 
  	switch (event) {
+ 	case SND_SOC_DAPM_PRE_PMU:
+ 		switch (w->shift) {
+ 		case ARIZONA_OUT1L_ENA_SHIFT:
+ 		case ARIZONA_OUT1R_ENA_SHIFT:
+ 		case ARIZONA_OUT2L_ENA_SHIFT:
+ 		case ARIZONA_OUT2R_ENA_SHIFT:
+ 		case ARIZONA_OUT3L_ENA_SHIFT:
+ 		case ARIZONA_OUT3R_ENA_SHIFT:
+ 			priv->out_up_pending++;
+ 			priv->out_up_delay += 17;
+ 			break;
+ 		default:
+ 			break;
+ 		}
+ 		break;
  	case SND_SOC_DAPM_POST_PMU:
  		switch (w->shift) {
  		case ARIZONA_OUT1L_ENA_SHIFT: