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
/
wavefront
/
wavefront.c
diff --git
a/sound/isa/wavefront/wavefront.c
b/sound/isa/wavefront/wavefront.c
index
7ae86f8
..
fa3ab96
100644
(file)
--- a/
sound/isa/wavefront/wavefront.c
+++ b/
sound/isa/wavefront/wavefront.c
@@
-589,7
+589,7
@@
snd_wavefront_probe (struct snd_card *card, int dev)
return snd_card_register(card);
}
return snd_card_register(card);
}
-static int __
dev
init snd_wavefront_nonpnp_probe(struct platform_device *pdev)
+static int __init snd_wavefront_nonpnp_probe(struct platform_device *pdev)
{
int dev = pdev->id;
struct snd_card *card;
{
int dev = pdev->id;
struct snd_card *card;
@@
-637,7
+637,6
@@
static struct platform_driver snd_wavefront_driver = {
#ifdef CONFIG_PNP
#ifdef CONFIG_PNP
-static unsigned int __devinitdata wavefront_pnp_devices;
static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid)
static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid)
@@
-671,7
+670,6
@@
static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
pnp_set_card_drvdata(pcard, card);
dev++;
pnp_set_card_drvdata(pcard, card);
dev++;
- wavefront_pnp_devices++;
return 0;
}
return 0;
}
@@
-712,31
+710,27
@@
static int __init alsa_card_wavefront_init(void)
if ((err = platform_driver_register(&snd_wavefront_driver)) < 0)
return err;
if ((err = platform_driver_register(&snd_wavefront_driver)) < 0)
return err;
- 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;
#ifdef CONFIG_PNP
if (isapnp[i])
continue;
#endif
device = platform_device_register_simple(WAVEFRONT_DRIVER,
i, NULL, 0);
#ifdef CONFIG_PNP
if (isapnp[i])
continue;
#endif
device = platform_device_register_simple(WAVEFRONT_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;
}
platform_devices[i] = device;
cards++;
}
#ifdef CONFIG_PNP
}
platform_devices[i] = device;
cards++;
}
#ifdef CONFIG_PNP
-
err
= pnp_register_card_driver(&wavefront_pnpc_driver);
- if (
!err
) {
+
i
= pnp_register_card_driver(&wavefront_pnpc_driver);
+ if (
i >= 0
) {
pnp_registered = 1;
pnp_registered = 1;
- cards +=
wavefront_pnp_devices
;
+ cards +=
i
;
}
#endif
}
#endif
@@
-744,10
+738,14
@@
static int __init alsa_card_wavefront_init(void)
#ifdef MODULE
printk (KERN_ERR "No WaveFront cards found or devices busy\n");
#endif
#ifdef MODULE
printk (KERN_ERR "No WaveFront cards found or devices busy\n");
#endif
-
snd_wavefront_unregister_all()
;
-
return -ENODEV
;
+
err = -ENODEV
;
+
goto errout
;
}
return 0;
}
return 0;
+
+ errout:
+ snd_wavefront_unregister_all();
+ return err;
}
static void __exit alsa_card_wavefront_exit(void)
}
static void __exit alsa_card_wavefront_exit(void)