summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-11 16:00:59 (GMT)
committerTakashi Iwai <tiwai@suse.de>2013-07-15 19:25:14 (GMT)
commite6355ad7b1c6f70e2f48ae159f5658b441ccff95 (patch)
tree035c86cf3681785a53df5d828b5668347d1030db /drivers/media
parent61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae (diff)
downloadlinux-fsl-qoriq-e6355ad7b1c6f70e2f48ae159f5658b441ccff95.tar.xz
[media] saa7134: Fix unlocked snd_pcm_stop() call
snd_pcm_stop() must be called in the PCM substream lock context. Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/pci/saa7134/saa7134-alsa.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
index 10460fd..dbcdfbf 100644
--- a/drivers/media/pci/saa7134/saa7134-alsa.c
+++ b/drivers/media/pci/saa7134/saa7134-alsa.c
@@ -172,7 +172,9 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev,
dprintk("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count,
dev->dmasound.bufsize, dev->dmasound.blocks);
spin_unlock(&dev->slock);
+ snd_pcm_stream_lock(dev->dmasound.substream);
snd_pcm_stop(dev->dmasound.substream,SNDRV_PCM_STATE_XRUN);
+ snd_pcm_stream_unlock(dev->dmasound.substream);
return;
}