[PATCH] sound/pci/azt3328.c: adjust error handling code to include debugging code

[PATCH] sound/pci/azt3328.c: adjust error handling code to include debugging code

[Julia Lawall]

From: Julia Lawall <julia@diku.dk>

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 <julia@diku.dk>

---
 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)");

Re: [PATCH] sound/pci/azt3328.c: adjust error handling code to include debugging code

[Takashi Iwai]

At Wed, 10 Aug 2011 11:49:04 +0200,
Julia Lawall wrote:
> 
> From: Julia Lawall <julia@diku.dk>
> 
> 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 <julia@diku.dk>

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)");
> 

Re: [PATCH] sound/pci/azt3328.c: adjust error handling code to

[Andreas Mohr]

Hi,

On Wed, Aug 10, 2011 at 11:54:08AM +0200, Takashi Iwai wrote:
> At Wed, 10 Aug 2011 11:49:04 +0200,
> Julia Lawall wrote:
> > 
> > From: Julia Lawall <julia@diku.dk>
> > 
> > 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 <julia@diku.dk>
> 
> Applied now to sound git tree.  Thanks.

5 minutes, 4 seconds. Your responsiveness appears to be degrading. I've
seen better ;)

JFTR:
Acked-by: Andreas Mohr <andi@lisas.de>

Andreas Mohr

Re: [PATCH] sound/pci/azt3328.c: adjust error handling code to include debugging code

[Takashi Iwai]

At Wed, 10 Aug 2011 13:15:42 +0200,
Andreas Mohr wrote:
> 
> Hi,
> 
> On Wed, Aug 10, 2011 at 11:54:08AM +0200, Takashi Iwai wrote:
> > At Wed, 10 Aug 2011 11:49:04 +0200,
> > Julia Lawall wrote:
> > > 
> > > From: Julia Lawall <julia@diku.dk>
> > > 
> > > 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 <julia@diku.dk>
> > 
> > Applied now to sound git tree.  Thanks.
> 
> 5 minutes, 4 seconds. Your responsiveness appears to be degrading. I've
> seen better ;)

Oh, could you bisect a regression? ;)


Takashi

Re: [PATCH] sound/pci/azt3328.c: adjust error handling code to

[Andreas Mohr]

Hi,

On Wed, Aug 10, 2011 at 01:31:24PM +0200, Takashi Iwai wrote:
> At Wed, 10 Aug 2011 13:15:42 +0200,
> Andreas Mohr wrote:
> > 5 minutes, 4 seconds. Your responsiveness appears to be degrading. I've
> > seen better ;)
> 
> Oh, could you bisect a regression? ;)

I'd probably have to consult Gunther von Hagens :-P

Andreas Mohr