diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-11 18:00:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 14:07:28 -0700 |
| commit | d23067e924e410875602b3427251b88cd18da73f (patch) | |
| tree | a9a87f1b8fc25682a9a906e3deaf7fab34f39351 | |
| parent | 5ebc73095cf30bca82ef2983a46756ff26b1a810 (diff) | |
| download | linux-3.10-d23067e924e410875602b3427251b88cd18da73f.tar.gz linux-3.10-d23067e924e410875602b3427251b88cd18da73f.tar.bz2 linux-3.10-d23067e924e410875602b3427251b88cd18da73f.zip | |
ASoC: s6000: Fix unlocked snd_pcm_stop() call
commit 61be2b9a18ec70f3cbe3deef7a5f77869c71b5ae upstream.
snd_pcm_stop() must be called in the PCM substream lock context.
Acked-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 1358c7de252..d0740a76296 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; } |