diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-11 18:00:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-15 21:25:14 +0200 |
| commit | e6355ad7b1c6f70e2f48ae159f5658b441ccff95 (patch) | |
| tree | 035c86cf3681785a53df5d828b5668347d1030db /drivers/media/pci | |
| parent | ASoC: s6000: Fix unlocked snd_pcm_stop() call (diff) | |
| download | linux-e6355ad7b1c6f70e2f48ae159f5658b441ccff95.tar.xz linux-e6355ad7b1c6f70e2f48ae159f5658b441ccff95.zip | |
[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/pci')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-alsa.c | 2 |
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, 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; } |