Merge branch 'topic/arizona' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/codecs/arizona.c
index 65977bc0db194b2442dc946ce83c3f5a16de15f1,32bc609f23e44bcaf7d3c299e7f625d9953154a9..29202610dd0dd90d72329265633844a3d833d640
--- 1/sound/soc/codecs/arizona.c
--- 2/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:

diff --cc sound/soc/codecs/wm5102.c
Simple merge

diff --cc sound/soc/codecs/wm5110.c
Simple merge

diff --cc sound/soc/codecs/wm8997.c
Simple merge