summaryrefslogtreecommitdiff
path: root/sound/pci/asihpi/asihpi.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-11 19:55:57 +0400
committerTakashi Iwai <tiwai@suse.de>2013-07-15 20:12:49 +0400
commit60478295d6876619f8f47f6d1a5c25eaade69ee3 (patch)
treeeacf6a2e3f0ed8eb7ec878591327c16ebd5240db /sound/pci/asihpi/asihpi.c
parent1abfeb03a9ee05097aaa33a0f44984fc82131b7f (diff)
downloadlinux-60478295d6876619f8f47f6d1a5c25eaade69ee3.tar.xz
ALSA: asihpi: Fix unlocked snd_pcm_stop() call
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>
Diffstat (limited to 'sound/pci/asihpi/asihpi.c')
-rw-r--r--sound/pci/asihpi/asihpi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index 185d54a5cb1a..dc632cdc3870 100644
--- 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 {