summaryrefslogtreecommitdiff
path: root/sound/pci/asihpi
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-07-11 19:55:57 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-26 01:07:27 +0400
commit4b06cd616f646a4257b39a1cc9a10410e7c90088 (patch)
tree2ffa9b4549541cdc6b7738bd0c133289b203e496 /sound/pci/asihpi
parent8268d1c754169393118ae847cf6741d777e976a4 (diff)
downloadlinux-4b06cd616f646a4257b39a1cc9a10410e7c90088.tar.xz
ALSA: asihpi: Fix unlocked snd_pcm_stop() call
commit 60478295d6876619f8f47f6d1a5c25eaade69ee3 upstream. snd_pcm_stop() must be called in the PCM substream lock context. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci/asihpi')
-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 fbc17203613c..a471d821c608 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 {