gcrypt: Fix return value of pad_oaep().

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 047eeaa348f9017431fc42e5c121ba08f331d3b0..6850221a83d861e04cfcd8254d3114f837013a2e 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -150,8 +150,10 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 
        if (ret == 0)
                return;
-       if (ret < 0 || !pad)
+       if (!pad)
                return sched_min_delay(s);
+       if (ret < 0)
+               return sched_request_barrier_or_min_delay(&pad->drain_barrier, s);
        /*
         * Data is available to be written to the alsa handle.  Compute number
         * of milliseconds until next buffer underrun would occur.
@@ -251,7 +253,9 @@ again:
        }
        frames = bytes / pad->bytes_per_frame;
        frames = snd_pcm_writei(pad->handle, data, frames);
-       if (frames >= 0) {
+       if (frames == 0 || frames == -EAGAIN)
+               return;
+       if (frames > 0) {
                btr_consume(btrn, frames * pad->bytes_per_frame);
                goto again;
        }
@@ -260,8 +264,6 @@ again:
                snd_pcm_prepare(pad->handle);
                return;
        }
-       if (frames == -EAGAIN)
-               return;
        PARA_WARNING_LOG("%s\n", snd_strerror(-frames));
        ret = -E_ALSA_WRITE;
 err: