summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-11 18:00:25 +0200
committerTakashi Iwai <tiwai@suse.de>2013-07-15 21:25:14 +0200
commit61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae (patch)
tree77a501b5d6ee44586728f948fd988a9b4a997f26 /sound/soc
parentASoC: atmel: Fix unlocked snd_pcm_stop() call (diff)
downloadlinux-61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae.tar.xz
linux-61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae.zip
ASoC: s6000: Fix unlocked snd_pcm_stop() call
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/s6000/s6000-pcm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c
index 1358c7de2521..d0740a762963 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;
}