From: Takashi Iwai Date: Thu, 11 Jul 2013 15:55:57 +0000 (+0200) Subject: ALSA: asihpi: Fix unlocked snd_pcm_stop() call X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4b06cd616f646a4257b39a1cc9a10410e7c90088;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index fbc17203613..a471d821c60 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 {