diff mbox

[1/1] Alsa: seq: correctly detect input buffer overflow

Message ID 1401858171-4448-1-git-send-email-agoode@google.com (mailing list archive)
State Accepted
Commit 21fd3e956ee8a307a06bc6e095f5767a00eb2a7e
Headers show

Commit Message

Adam Goode June 4, 2014, 5:02 a.m. UTC 
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>

Comments

Takashi Iwai June 4, 2014, 5:12 a.m. UTC | #1 
At Wed,  4 Jun 2014 01:02:51 -0400,
Adam Goode wrote:
> 
> 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>

Thanks, applied.


Takashi

> 
> 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;
> -- 
> 1.9.1.423.g4596e3a
>
diff mbox

Patch

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;