git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
isa
/
sgalaxy.c
diff --git
a/sound/isa/sgalaxy.c
b/sound/isa/sgalaxy.c
index
09c8e8c
..
0dbbb35
100644
(file)
--- a/
sound/isa/sgalaxy.c
+++ b/
sound/isa/sgalaxy.c
@@
-360,17
+360,13
@@
static int __init alsa_card_sgalaxy_init(void)
return err;
cards = 0;
return err;
cards = 0;
- for (i = 0; i < SNDRV_CARDS; i++) {
+ for (i = 0; i < SNDRV_CARDS
&& enable[i]
; i++) {
struct platform_device *device;
struct platform_device *device;
- if (! enable[i])
- continue;
device = platform_device_register_simple(SND_SGALAXY_DRIVER,
i, NULL, 0);
device = platform_device_register_simple(SND_SGALAXY_DRIVER,
i, NULL, 0);
- if (IS_ERR(device))
- continue;
- if (!platform_get_drvdata(device)) {
- platform_device_unregister(device);
- continue;
+ if (IS_ERR(device)) {
+ err = PTR_ERR(device);
+ goto errout;
}
devices[i] = device;
cards++;
}
devices[i] = device;
cards++;
@@
-379,10
+375,14
@@
static int __init alsa_card_sgalaxy_init(void)
#ifdef MODULE
snd_printk(KERN_ERR "Sound Galaxy soundcard not found or device busy\n");
#endif
#ifdef MODULE
snd_printk(KERN_ERR "Sound Galaxy soundcard not found or device busy\n");
#endif
-
snd_sgalaxy_unregister_all()
;
-
return -ENODEV
;
+
err = -ENODEV
;
+
goto errout
;
}
return 0;
}
return 0;
+
+ errout:
+ snd_sgalaxy_unregister_all();
+ return err;
}
static void __exit alsa_card_sgalaxy_exit(void)
}
static void __exit alsa_card_sgalaxy_exit(void)