OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
61be2b9
)
[media] saa7134: Fix unlocked snd_pcm_stop() call
author
Takashi Iwai
<tiwai@suse.de>
Thu, 11 Jul 2013 16:00:59 +0000
(18:00 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 15 Jul 2013 19:25:14 +0000
(21:25 +0200)
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>
drivers/media/pci/saa7134/saa7134-alsa.c
patch
|
blob
|
history
diff --git
a/drivers/media/pci/saa7134/saa7134-alsa.c
b/drivers/media/pci/saa7134/saa7134-alsa.c
index
10460fd
..
dbcdfbf
100644
(file)
--- 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;
}