summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Goode <agoode@google.com>2014-06-04 01:02:51 -0400
committerTakashi Iwai <tiwai@suse.de>2014-06-04 07:12:12 +0200
commit21fd3e956ee8a307a06bc6e095f5767a00eb2a7e (patch)
tree9656b152c0556e280c58a1685eb5c3ad0fce23c0
parent16088cb6c02d0b766b9b8d7edff98da7f1c93205 (diff)
downloadop-kernel-dev-21fd3e956ee8a307a06bc6e095f5767a00eb2a7e.zip
op-kernel-dev-21fd3e956ee8a307a06bc6e095f5767a00eb2a7e.tar.gz
ALSA: seq: correctly detect input buffer overflow
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>
-rw-r--r--sound/core/seq/seq_fifo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
index 5599899..53a403e 100644
--- a/sound/core/seq/seq_fifo.c
+++ b/sound/core/seq/seq_fifo.c
@@ -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;
OpenPOWER on IntegriCloud