From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753524Ab1HJJyK (ORCPT ); Wed, 10 Aug 2011 05:54:10 -0400 Received: from cantor2.suse.de ([195.135.220.15]:54375 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753172Ab1HJJyJ (ORCPT ); Wed, 10 Aug 2011 05:54:09 -0400 Date: Wed, 10 Aug 2011 11:54:08 +0200 Message-ID: From: Takashi Iwai To: Julia Lawall Cc: Jaroslav Kysela , kernel-janitors@vger.kernel.org, Andreas Mohr , Lucas De Marchi , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] sound/pci/azt3328.c: adjust error handling code to include debugging code In-Reply-To: <1312969744-29659-1-git-send-email-julia@diku.dk> References: <1312969744-29659-1-git-send-email-julia@diku.dk> 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 Wed, 10 Aug 2011 11:49:04 +0200, Julia Lawall wrote: > > From: Julia Lawall > > snd_azf3328_dbgcallenter is called at the very beginning of the function, > so it could be useful to call snd_azf3328_dbgcallleave at all exit points. > > Signed-off-by: Julia Lawall Applied now to sound git tree. Thanks. Takashi > --- > sound/pci/azt3328.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c > index e4d76a2..579fc0d 100644 > --- a/sound/pci/azt3328.c > +++ b/sound/pci/azt3328.c > @@ -2625,16 +2625,19 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) > int err; > > snd_azf3328_dbgcallenter(); > - if (dev >= SNDRV_CARDS) > - return -ENODEV; > + if (dev >= SNDRV_CARDS) { > + err = -ENODEV; > + goto out; > + } > if (!enable[dev]) { > dev++; > - return -ENOENT; > + err = -ENOENT; > + goto out; > } > > err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); > if (err < 0) > - return err; > + goto out; > > strcpy(card->driver, "AZF3328"); > strcpy(card->shortname, "Aztech AZF3328 (PCI168)"); >