diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-11 12:00:25 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-07-15 15:25:14 -0400 |
commit | 61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae (patch) | |
tree | 77a501b5d6ee44586728f948fd988a9b4a997f26 /sound | |
parent | 571185717f8d7f2a088a7ac38d94a9ad5fd9da5c (diff) |
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')
-rw-r--r-- | sound/soc/s6000/s6000-pcm.c | 2 |
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) | |||
128 | substream->runtime && | 128 | substream->runtime && |
129 | snd_pcm_running(substream)) { | 129 | snd_pcm_running(substream)) { |
130 | dev_dbg(pcm->dev, "xrun\n"); | 130 | dev_dbg(pcm->dev, "xrun\n"); |
131 | snd_pcm_stream_lock(substream); | ||
131 | snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); | 132 | snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); |
133 | snd_pcm_stream_unlock(substream); | ||
132 | ret = IRQ_HANDLED; | 134 | ret = IRQ_HANDLED; |
133 | } | 135 | } |
134 | 136 | ||