diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-11 19:59:33 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-26 01:07:25 +0400 |
commit | 2306396c952129dcf127d47c0383ae28c7288ed0 (patch) | |
tree | 426fec8df1f163e56a5eac4b1a5f1c8bf9927a9c | |
parent | c9c8dd7d3cacecd3a3f0e6e49c0a0f8f93d3d04e (diff) | |
download | linux-2306396c952129dcf127d47c0383ae28c7288ed0.tar.xz |
ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call
commit 46f6c1aaf790be9ea3c8ddfc8f235a5f677d08e2 upstream.
snd_pcm_stop() must be called in the PCM substream lock context.
Acked-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | sound/arm/pxa2xx-pcm-lib.c | 2 |
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); |