| Date | Wed, 11 Sep 2013 00:27:21 -0400 | From | Steven Rostedt <> | Subject | [014/251] ASoC: s6000: Fix unlocked snd_pcm_stop() call |
| |
3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <tiwai@suse.de>
[ Upstream commit 61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae ]
snd_pcm_stop() must be called in the PCM substream lock context.
Cc: <stable@vger.kernel.org> Acked-by: Mark Brown <broonie@linaro.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- sound/soc/s6000/s6000-pcm.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c index 716da86..17f9348 100644 --- a/sound/soc/s6000/s6000-pcm.c +++ b/sound/soc/s6000/s6000-pcm.c @@ -128,7 +128,9 @@ static irqreturn_t s6000_pcm_irq(int irq, void *data) substream->runtime && snd_pcm_running(substream)) { dev_dbg(pcm->dev, "xrun\n"); + snd_pcm_stream_lock(substream); snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); + snd_pcm_stream_unlock(substream); ret = IRQ_HANDLED; } -- 1.7.10.4
|