Merge remote-tracking branch 'asoc/topic/core' into asoc-next

diff --cc drivers/mfd/arizona-core.c
Simple merge

diff --cc sound/soc/soc-pcm.c
index 5c3ca2a3466170cd132464760dffd9b63155ebe9,3a2423bd84b20877828316c1b3f14b90ff5ee9c7..d7711fce119b7b949bc521759b2f13e177dd657d
--- 1/sound/soc/soc-pcm.c
--- 2/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@@ -331,14 -330,14 +331,14 @@@ static void close_delayed_work(struct w
  
        mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
  
 -      pr_debug("pop wq checking: %s status: %s waiting: %s\n",
 +      dev_dbg(rtd->dev, "ASoC: pop wq checking: %s status: %s waiting: %s\n",
                 codec_dai->driver->playback.stream_name,
                 codec_dai->playback_active ? "active" : "inactive",
-                codec_dai->pop_wait ? "yes" : "no");
+                rtd->pop_wait ? "yes" : "no");
  
        /* are we waiting on this codec DAI stream */
-       if (codec_dai->pop_wait == 1) {
-               codec_dai->pop_wait = 0;
+       if (rtd->pop_wait == 1) {
+               rtd->pop_wait = 0;
                snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_PLAYBACK,
                                          SND_SOC_DAPM_STREAM_STOP);
        }