Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efd614ac authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2

parents da1c6ea6 117ef957

sound/soc/imx/imx-pcm-fiq.c

+0 −1
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ 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;