From: Takashi Iwai Date: Thu, 11 Jul 2013 15:59:33 +0000 (+0200) Subject: ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=46f6c1aaf790be9ea3c8ddfc8f235a5f677d08e2;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call snd_pcm_stop() must be called in the PCM substream lock context. Cc: Acked-by: Mark Brown Signed-off-by: Takashi Iwai --- diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index 76e0d5695075..823359ed95e1 100644 --- a/sound/arm/pxa2xx-pcm-lib.c +++ b/sound/arm/pxa2xx-pcm-lib.c @@ -166,7 +166,9 @@ void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id) } else { printk(KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n", rtd->params->name, dma_ch, dcsr); + snd_pcm_stream_lock(substream); snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); + snd_pcm_stream_unlock(substream); } } EXPORT_SYMBOL(pxa2xx_pcm_dma_irq);