mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-05 13:30:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dmix: Don't use assert() and abort()

Browse source 
We seem to still have some races at closing a dmix stream, but
aborting is the worst option.  Let's make not melt down.

Reference: https://bugzilla.novell.com/show_bug.cgi?id=852446
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2013-11-27 09:37:54 +01:00
parent 29d89ba045
commit 49ad6699e6
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pcm/pcm_direct.h
View file

@ -274,8 +274,8 @@ static inline int snd_pcm_direct_semaphore_up(snd_pcm_direct_t *dmix, int sem_nu
static inline int snd_pcm_direct_semaphore_final(snd_pcm_direct_t *dmix, int sem_num) static inline int snd_pcm_direct_semaphore_final(snd_pcm_direct_t *dmix, int sem_num)
{ {
if (dmix->locked[sem_num] != 1) { if (dmix->locked[sem_num] != 1) {
assert(dmix->locked[sem_num] != 1); SNDMSG("invalid semaphore count to finalize %d: %d", sem_num, dmix->locked[sem_num]);
abort(); return -EBUSY;
} }
return snd_pcm_direct_semaphore_up(dmix, sem_num); return snd_pcm_direct_semaphore_up(dmix, sem_num);
} }