ALSA: seq: correctly detect input buffer overflow
authorAdam Goode <agoode@google.com>
Wed, 4 Jun 2014 05:02:51 +0000 (01:02 -0400)
committerTakashi Iwai <tiwai@suse.de>
Wed, 4 Jun 2014 05:12:12 +0000 (07:12 +0200)
snd_seq_event_dup returns -ENOMEM in some buffer-full conditions,
but usually returns -EAGAIN. Make -EAGAIN trigger the overflow
condition in snd_seq_fifo_event_in so that the fifo is cleared
and -ENOSPC is returned to userspace as stated in the alsa-lib docs.

Signed-off-by: Adam Goode <agoode@google.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/seq/seq_fifo.c

index 559989992bef6ba7f35f7c63731bb6d40b5bd463..53a403e17c5bba08a755da454dfee3d5829c2cc9 100644 (file)
@@ -124,7 +124,7 @@ int snd_seq_fifo_event_in(struct snd_seq_fifo *f,
        snd_use_lock_use(&f->use_lock);
        err = snd_seq_event_dup(f->pool, event, &cell, 1, NULL); /* always non-blocking */
        if (err < 0) {
-               if (err == -ENOMEM)
+               if ((err == -ENOMEM) || (err == -EAGAIN))
                        atomic_inc(&f->overflow);
                snd_use_lock_free(&f->use_lock);
                return err;