From: Takashi Iwai Subject: Re: [PATCH 1/1] Alsa: seq: correctly detect input buffer overflow Date: Wed, 04 Jun 2014 07:12:29 +0200 Message-ID: References: <1401858171-4448-1-git-send-email-agoode@google.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 5B446261B11 for ; Wed, 4 Jun 2014 07:12:29 +0200 (CEST) In-Reply-To: <1401858171-4448-1-git-send-email-agoode@google.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Adam Goode Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org 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 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 >