summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-08-10 11:49:04 +0200
committerTakashi Iwai <tiwai@suse.de>2011-08-10 11:52:23 +0200
commita5a3973da8b52944bc5909852714e55771c31ce7 (patch)
tree329c6d86139e590b512a56588fbea914354b801a /sound
parent96b635977984a88ecdb9cc76b8a54db7297f36e0 (diff)
downloadlinux-3.10-a5a3973da8b52944bc5909852714e55771c31ce7.tar.gz
linux-3.10-a5a3973da8b52944bc5909852714e55771c31ce7.tar.bz2
linux-3.10-a5a3973da8b52944bc5909852714e55771c31ce7.zip
ALSA: azt3328 - adjust error handling code to include debugging code
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> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/azt3328.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index e4d76a270c9..579fc0dce12 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)");