summaryrefslogtreecommitdiffstats
path: root/sound/arm
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-11 17:59:33 +0200
committerTakashi Iwai <tiwai@suse.de>2013-07-15 21:25:13 +0200
commit46f6c1aaf790be9ea3c8ddfc8f235a5f677d08e2 (patch)
tree293d699138f68eccb257bb1702eb5500f40ca43b /sound/arm
parent5be1efb4c2ed79c3d7c0cbcbecae768377666e84 (diff)
downloadblackbird-op-linux-46f6c1aaf790be9ea3c8ddfc8f235a5f677d08e2.tar.gz
blackbird-op-linux-46f6c1aaf790be9ea3c8ddfc8f235a5f677d08e2.zip
ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call
snd_pcm_stop() must be called in the PCM substream lock context. Cc: <stable@vger.kernel.org> Acked-by: Mark Brown <broonie@linaro.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/arm')
-rw-r--r--sound/arm/pxa2xx-pcm-lib.c2
1 files changed, 2 insertions, 0 deletions
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);
OpenPOWER on IntegriCloud