From: Takashi Iwai <tiwai@suse.de>
Date: Sat, 16 Nov 2013 10:45:55 +0000 (+0100)
Subject: Merge tag 'asoc-v3.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=abfe69dd2e313d0c8226ca4a12329e3d829cfd7c;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'asoc-v3.13-4' of git://git./linux/kernel/git/broonie/sound into for-linus

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.
---

abfe69dd2e313d0c8226ca4a12329e3d829cfd7c
diff --cc sound/soc/fsl/imx-pcm-fiq.c
index 10e330514ed8,2fc872b2deff..f00b512dbada
--- a/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);