diff options
| -rw-r--r-- | sys/dev/sound/pcm/channel.h | 9 | ||||
| -rw-r--r-- | sys/dev/sound/pcm/dsp.c | 17 |
2 files changed, 11 insertions, 15 deletions
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index aac6ab368625..2f71f0708c8e 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -57,10 +57,11 @@ struct pcmchan_syncmember; extern struct mtx snd_pcm_syncgroups_mtx; extern SLIST_HEAD(pcm_synclist, pcmchan_syncgroup) snd_pcm_syncgroups; -#define PCM_SG_LOCK() mtx_lock(&snd_pcm_syncgroups_mtx) -#define PCM_SG_TRYLOCK() mtx_trylock(&snd_pcm_syncgroups_mtx) -#define PCM_SG_UNLOCK() mtx_unlock(&snd_pcm_syncgroups_mtx) -#define PCM_SG_LOCKASSERT(arg) mtx_assert(&snd_pcm_syncgroups_mtx, arg) +#define PCM_SG_LOCKPTR() (&snd_pcm_syncgroups_mtx) +#define PCM_SG_LOCK() mtx_lock(PCM_SG_LOCKPTR()) +#define PCM_SG_TRYLOCK() mtx_trylock(PCM_SG_LOCKPTR()) +#define PCM_SG_UNLOCK() mtx_unlock(PCM_SG_LOCKPTR()) +#define PCM_SG_LOCKASSERT(arg) mtx_assert(PCM_SG_LOCKPTR(), arg) /** * @brief Specifies an audio device sync group diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 8952447a705a..633f096a4e78 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2684,14 +2684,11 @@ dsp_oss_syncstart(int sg_id) struct pcmchan_syncmember *sm, *sm_tmp; struct pcmchan_syncgroup *sg; struct pcm_channel *c; - int ret, needlocks; + int ret; - /* Get the synclists lock */ PCM_SG_LOCK(); - do { ret = 0; - needlocks = 0; /* Search for syncgroup by ID */ SLIST_FOREACH(sg, &snd_pcm_syncgroups, link) { @@ -2728,16 +2725,14 @@ dsp_oss_syncstart(int sg_id) } /** @todo Is PRIBIO correct/ */ - ret = msleep(sm, &snd_pcm_syncgroups_mtx, + ret = msleep(sm, PCM_SG_LOCKPTR(), PRIBIO | PCATCH, "pcmsg", timo); - if (ret == EINTR || ret == ERESTART) - break; - - needlocks = 1; - ret = 0; /* Assumes ret == EAGAIN... */ + if (ret == EAGAIN) + ret = 0; + break; } } - } while (needlocks && ret == 0); + } while (ret == 0 && sm != NULL); /* Proceed only if no errors encountered. */ if (ret == 0) { |