From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755019Ab2DJGnP (ORCPT ); Tue, 10 Apr 2012 02:43:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50414 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752980Ab2DJGnN (ORCPT ); Tue, 10 Apr 2012 02:43:13 -0400 Date: Tue, 10 Apr 2012 08:43:12 +0200 Message-ID: From: Takashi Iwai To: Julia Lawall Cc: Jaroslav Kysela , 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 In-Reply-To: <1333959395-18960-1-git-send-email-Julia.Lawall@lip6.fr> References: <1333959395-18960-1-git-send-email-Julia.Lawall@lip6.fr> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Mon, 9 Apr 2012 10:16:35 +0200, Julia Lawall wrote: > > From: Julia Lawall > > 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 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; > } > > /* >