OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5711857
)
ASoC: s6000: Fix unlocked snd_pcm_stop() call
author
Takashi Iwai
<tiwai@suse.de>
Thu, 11 Jul 2013 16:00:25 +0000
(18:00 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 15 Jul 2013 19:25:14 +0000
(21:25 +0200)
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>
sound/soc/s6000/s6000-pcm.c
patch
|
blob
|
history
diff --git
a/sound/soc/s6000/s6000-pcm.c
b/sound/soc/s6000/s6000-pcm.c
index
1358c7d
..
d0740a7
100644
(file)
--- 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;
}