Merge tag 'asoc-v3.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

ASoC: Fixes for v3.13

A few fixes in drivers, the i.MX and wm8962 fixes are for a pretty nasty
issues for users of those drivers if they run into them.

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

diff --cc sound/soc/fsl/imx-pcm-fiq.c
index 10e3305,2fc872b..f00b512
--- 1/sound/soc/fsl/imx-pcm-fiq.c
--- 2/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@@ -50,9 -53,11 +51,9 @@@ static enum hrtimer_restart snd_hrtimer
        struct imx_pcm_runtime_data *iprtd =
                container_of(hrt, struct imx_pcm_runtime_data, hrt);
        struct snd_pcm_substream *substream = iprtd->substream;
 -      struct snd_pcm_runtime *runtime = substream->runtime;
        struct pt_regs regs;
 -      unsigned long delta;
  
-       if (!atomic_read(&iprtd->running))
+       if (!atomic_read(&iprtd->playing) && !atomic_read(&iprtd->capturing))
                return HRTIMER_NORESTART;
  
        get_fiq_regs(&regs);