From 75e02c4646cb53069ff9f996b8b5e068b775cf9d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 20 Apr 2017 18:27:46 +0200 Subject: [PATCH] Simplify alsa_write --- audio/drivers/alsa.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c index e81d38ad91..3e2c3e90f7 100644 --- a/audio/drivers/alsa.c +++ b/audio/drivers/alsa.c @@ -225,21 +225,22 @@ static ssize_t alsa_write(void *data, const void *buf_, size_t size_) break; } - else if (frames == -EAGAIN && !alsa->nonblock) + else if (frames == -EAGAIN) { - /* Definitely not supposed to happen. */ - RARCH_WARN("[ALSA]: poll() was signaled, but EAGAIN returned from write.\n" - "Your ALSA driver might be subtly broken.\n"); - - if (eagain_retry) + if (!alsa->nonblock) { - eagain_retry = false; - continue; + /* Definitely not supposed to happen. */ + RARCH_WARN("[ALSA]: poll() was signaled, but EAGAIN returned from write.\n" + "Your ALSA driver might be subtly broken.\n"); + + if (eagain_retry) + { + eagain_retry = false; + continue; + } } return written; } - else if (frames == -EAGAIN) /* Expected if we're running nonblock. */ - return written; else if (frames < 0) { RARCH_ERR("[ALSA]: Unknown error occurred (%s).\n",