From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 11 Jul 2013 16:00:25 +0000 (+0200)
Subject: ASoC: s6000: Fix unlocked snd_pcm_stop() call
X-Git-Tag: MMI-PSA29.97-13-9~13796^2~25
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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;
 		}