aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-11 12:00:59 -0400
committerTakashi Iwai <tiwai@suse.de>2013-07-15 15:25:14 -0400
commite6355ad7b1c6f70e2f48ae159f5658b441ccff95 (patch)
tree035c86cf3681785a53df5d828b5668347d1030db
parent61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae (diff)
[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>
-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 10460fd3ce39..dbcdfbf8aed0 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,
172 dprintk("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count, 172 dprintk("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count,
173 dev->dmasound.bufsize, dev->dmasound.blocks); 173 dev->dmasound.bufsize, dev->dmasound.blocks);
174 spin_unlock(&dev->slock); 174 spin_unlock(&dev->slock);
175 snd_pcm_stream_lock(dev->dmasound.substream);
175 snd_pcm_stop(dev->dmasound.substream,SNDRV_PCM_STATE_XRUN); 176 snd_pcm_stop(dev->dmasound.substream,SNDRV_PCM_STATE_XRUN);
177 snd_pcm_stream_unlock(dev->dmasound.substream);
176 return; 178 return;
177 } 179 }
178 180