From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 31 Aug 2011 08:57:44 +0000 (+0100)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=efd614ac067a30b5541640e89d08f7afa7601f24;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'for-3.1' into for-3.2
---

efd614ac067a30b5541640e89d08f7afa7601f24
diff --cc sound/soc/imx/imx-pcm-fiq.c
index ac790e87e23,7945625e0e0..c8527ead373
--- a/sound/soc/imx/imx-pcm-fiq.c
+++ b/sound/soc/imx/imx-pcm-fiq.c
@@@ -240,10 -240,8 +240,9 @@@ static int ssi_irq = 0
  
  static int imx_pcm_fiq_new(struct snd_soc_pcm_runtime *rtd)
  {
- 	struct snd_card *card = rtd->card->snd_card;
  	struct snd_soc_dai *dai = rtd->cpu_dai;
  	struct snd_pcm *pcm = rtd->pcm;
 +	struct snd_pcm_substream *substream;
  	int ret;
  
  	ret = imx_pcm_new(rtd);