Hi Greg or Ben,
commit e6355ad7b1c6f70e2f48ae159f5658b441ccff95
[media] saa7134: Fix unlocked snd_pcm_stop() call
The commit is one patch of the patchset "snd_pcm_stop() lock fixes"
which had been backported to 3.2-stable. But 3.2-stable missed it.
I adjust context and can be applied to 3.4 and 3.2 stable clean.
What do you think?
Thanks,
Weng Meiling
===================
From: Takashi Iwai <tiwai@xxxxxxx>
snd_pcm_stop() must be called in the PCM substream lock context.
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
[wml: Backported to 3.4: Adjust filename]
Signed-off-by: Weng Meiling <wengmeiling.weng@xxxxxxxxxx>
---
drivers/media/video/saa7134/saa7134-alsa.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 10460fd..dbcdfbf 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/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;
}
--
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html