瀏覽代碼

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>
Takashi Iwai 12 年之前
父節點
當前提交
60478295d6
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      sound/pci/asihpi/asihpi.c

+ 3 - 0
sound/pci/asihpi/asihpi.c

@@ -769,7 +769,10 @@ static void snd_card_asihpi_timer_function(unsigned long data)
 						s->number);
 						s->number);
 				ds->drained_count++;
 				ds->drained_count++;
 				if (ds->drained_count > 20) {
 				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_stop(s, SNDRV_PCM_STATE_XRUN);
+					snd_pcm_stream_unlock_irqrestore(s, flags);
 					continue;
 					continue;
 				}
 				}
 			} else {
 			} else {