projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1abfeb0
)
ALSA: asihpi: Fix unlocked snd_pcm_stop() call
author
Takashi Iwai
<tiwai@suse.de>
Thu, 11 Jul 2013 15:55:57 +0000
(17:55 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 15 Jul 2013 16:12:49 +0000
(18:12 +0200)
snd_pcm_stop() must be called in the PCM substream lock context.
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/asihpi/asihpi.c
patch
|
blob
|
blame
|
history
diff --git
a/sound/pci/asihpi/asihpi.c
b/sound/pci/asihpi/asihpi.c
index 185d54a5cb1af5765f2c2ae8f09af36f28f55de2..dc632cdc38706ec74c18978739e0819257e1d3a8 100644
(file)
--- a/
sound/pci/asihpi/asihpi.c
+++ b/
sound/pci/asihpi/asihpi.c
@@
-769,7
+769,10
@@
static void snd_card_asihpi_timer_function(unsigned long data)
s->number);
ds->drained_count++;
if (ds->drained_count > 20) {
+ unsigned long flags;
+ snd_pcm_stream_lock_irqsave(s, flags);
snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN);
+ snd_pcm_stream_unlock_irqrestore(s, flags);
continue;
}
} else {