mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Jaroslav Kysela <perex@perex.cz>,
	kernel-janitors@vger.kernel.org, alsa-devel@alsa-project.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] sound/isa/sscape.c: add missing resource-release code
Date: Tue, 10 Apr 2012 08:43:12 +0200	[thread overview]
Message-ID: <s5hobr0ulxb.wl%tiwai@suse.de> (raw)
In-Reply-To: <1333959395-18960-1-git-send-email-Julia.Lawall@lip6.fr>

At Mon,  9 Apr 2012 10:16:35 +0200,
Julia Lawall wrote:
> 
> From: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> At the point of this error-handling code, both regions and the dma have
> been allocated, so free it as done in previous and subsequent
> error-handling code.
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

Applied now.  Thanks.


Takashi

> 
> ---
>  sound/isa/sscape.c |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
> index b4a6aa9..131dd98 100644
> --- a/sound/isa/sscape.c
> +++ b/sound/isa/sscape.c
> @@ -1019,13 +1019,15 @@ static int __devinit create_sscape(int dev, struct snd_card *card)
>  	irq_cfg = get_irq_config(sscape->type, irq[dev]);
>  	if (irq_cfg == INVALID_IRQ) {
>  		snd_printk(KERN_ERR "sscape: Invalid IRQ %d\n", irq[dev]);
> -		return -ENXIO;
> +		err = -ENXIO;
> +		goto _release_dma;
>  	}
>  
>  	mpu_irq_cfg = get_irq_config(sscape->type, mpu_irq[dev]);
>  	if (mpu_irq_cfg == INVALID_IRQ) {
>  		snd_printk(KERN_ERR "sscape: Invalid IRQ %d\n", mpu_irq[dev]);
> -		return -ENXIO;
> +		err = -ENXIO;
> +		goto _release_dma;
>  	}
>  
>  	/*
> 

      reply	other threads:[~2012-04-10  6:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-09  8:16 Julia Lawall
2012-04-10  6:43 ` Takashi Iwai [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5hobr0ulxb.wl%tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=Julia.Lawall@lip6.fr \
    --cc=alsa-devel@alsa-project.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®