From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 6 Nov 2014 11:12:02 +0000 (+0100)
Subject: pcm: dmix: Don't ignore SND_TIMER_EVENT_MSTOP
X-Git-Tag: v1.0.29~23
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=5a066cb884815ab48924da8f70514d587400dd6a;p=alsa-lib.git

pcm: dmix: Don't ignore SND_TIMER_EVENT_MSTOP

When a slave PCM gets an error like XRUN, it stops and notifies with
SND_TIMER_EVENT_MSTOP event.  But the current code filters out this
type and eventually hang due to the empty timer queue.  The fix is to
just add this event type to the filter bit mask.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
index 8e37bcba..195fddf0 100644
--- a/src/pcm/pcm_direct.c
+++ b/src/pcm/pcm_direct.c
@@ -1148,6 +1148,7 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix)
 
 	dmix->timer_events = (1<<SND_TIMER_EVENT_MSUSPEND) |
 			     (1<<SND_TIMER_EVENT_MRESUME) |
+			     (1<<SND_TIMER_EVENT_MSTOP) |
 			     (1<<SND_TIMER_EVENT_STOP);
 
 	/*