From: Jaroslav Kysela Date: Wed, 16 Jul 2003 19:31:15 +0000 (+0000) Subject: Fixed snd_pcm_wait() function X-Git-Tag: android-x86-9.0-r1~2193 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ed9961c9a2daed012bd332197e830bd7d845ac3c;p=android-x86%2Fexternal-alsa-lib.git Fixed snd_pcm_wait() function --- diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index eaa2eeab..dbbfbe4a 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -2008,11 +2008,11 @@ int snd_pcm_wait(snd_pcm_t *pcm, int timeout) { struct pollfd pfd; unsigned short revents; - int err; + int err, err_poll; err = snd_pcm_poll_descriptors(pcm, &pfd, 1); assert(err == 1); - err = poll(&pfd, 1, timeout); - if (err < 0) + err_poll = poll(&pfd, 1, timeout); + if (err_poll < 0) return -errno; err = snd_pcm_poll_descriptors_revents(pcm, &pfd, 1, &revents); if (err < 0) @@ -2028,7 +2028,7 @@ int snd_pcm_wait(snd_pcm_t *pcm, int timeout) return -EIO; } } - return err > 0 ? 1 : 0; + return err_pol > 0 ? 1 : 0; } /**