From d7c33a8fb5b532af7ba95dd466ae819b0491bbc1 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 22 Feb 2006 17:14:34 +0100 Subject: [PATCH] --- yaml --- r: 22738 b: refs/heads/master c: 62c5549ee246fa30606f918f97c6b3cde2831292 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/core/seq/seq_virmidi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 49d728744138..9296ecf3776f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e661d0ddc58740eca41313fbb01f1612ff9c7878 +refs/heads/master: 62c5549ee246fa30606f918f97c6b3cde2831292 diff --git a/trunk/sound/core/seq/seq_virmidi.c b/trunk/sound/core/seq/seq_virmidi.c index 14fd1a608e14..f4edec603b8f 100644 --- a/trunk/sound/core/seq/seq_virmidi.c +++ b/trunk/sound/core/seq/seq_virmidi.c @@ -167,7 +167,7 @@ static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, return; /* ignored */ } if (vmidi->event.type != SNDRV_SEQ_EVENT_NONE) { - if (snd_seq_kernel_client_dispatch(vmidi->client, &vmidi->event, 0, 0) < 0) + if (snd_seq_kernel_client_dispatch(vmidi->client, &vmidi->event, in_atomic(), 0) < 0) return; vmidi->event.type = SNDRV_SEQ_EVENT_NONE; } @@ -186,7 +186,7 @@ static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, pbuf += res; count -= res; if (vmidi->event.type != SNDRV_SEQ_EVENT_NONE) { - if (snd_seq_kernel_client_dispatch(vmidi->client, &vmidi->event, 0, 0) < 0) + if (snd_seq_kernel_client_dispatch(vmidi->client, &vmidi->event, in_atomic(), 0) < 0) return; vmidi->event.type = SNDRV_SEQ_EVENT_NONE; }