git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugzilla-7897 into release branch
[sfrench/cifs-2.6.git]
/
sound
/
isa
/
gus
/
gusclassic.c
diff --git
a/sound/isa/gus/gusclassic.c
b/sound/isa/gus/gusclassic.c
index 91c219116d7a292809a225fa08ff0a4c25159c19..0395e2e0dd038290f6bb16dff43944b0acd40cf3 100644
(file)
--- a/
sound/isa/gus/gusclassic.c
+++ b/
sound/isa/gus/gusclassic.c
@@
-76,7
+76,7
@@
static struct platform_device *devices[SNDRV_CARDS];
#define PFX "gusclassic: "
#define PFX "gusclassic: "
-static int __init snd_gusclassic_detect(struct snd_gus_card * gus)
+static int __
dev
init snd_gusclassic_detect(struct snd_gus_card * gus)
{
unsigned char d;
{
unsigned char d;
@@
-95,7
+95,7
@@
static int __init snd_gusclassic_detect(struct snd_gus_card * gus)
return 0;
}
return 0;
}
-static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus)
+static void __
dev
init snd_gusclassic_init(int dev, struct snd_gus_card * gus)
{
gus->equal_irq = 0;
gus->codec_flag = 0;
{
gus->equal_irq = 0;
gus->codec_flag = 0;
@@
-103,7
+103,7
@@
static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus)
gus->joystick_dac = joystick_dac[dev];
}
gus->joystick_dac = joystick_dac[dev];
}
-static int __init snd_gusclassic_probe(struct platform_device *pdev)
+static int __
dev
init snd_gusclassic_probe(struct platform_device *pdev)
{
int dev = pdev->id;
static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};
{
int dev = pdev->id;
static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};
@@
-211,7
+211,7
@@
static int __init snd_gusclassic_probe(struct platform_device *pdev)
return err;
}
return err;
}
-static int snd_gusclassic_remove(struct platform_device *devptr)
+static int
__devexit
snd_gusclassic_remove(struct platform_device *devptr)
{
snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL);
{
snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL);
@@
-222,7
+222,7
@@
static int snd_gusclassic_remove(struct platform_device *devptr)
static struct platform_driver snd_gusclassic_driver = {
.probe = snd_gusclassic_probe,
static struct platform_driver snd_gusclassic_driver = {
.probe = snd_gusclassic_probe,
- .remove =
snd_gusclassic_remove
,
+ .remove =
__devexit_p(snd_gusclassic_remove)
,
/* FIXME: suspend/resume */
.driver = {
.name = GUSCLASSIC_DRIVER
/* FIXME: suspend/resume */
.driver = {
.name = GUSCLASSIC_DRIVER
@@
-247,13
+247,17
@@
static int __init alsa_card_gusclassic_init(void)
return err;
cards = 0;
return err;
cards = 0;
- for (i = 0; i < SNDRV_CARDS
&& enable[i]
; i++) {
+ for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
struct platform_device *device;
+ if (! enable[i])
+ continue;
device = platform_device_register_simple(GUSCLASSIC_DRIVER,
i, NULL, 0);
device = platform_device_register_simple(GUSCLASSIC_DRIVER,
i, NULL, 0);
- if (IS_ERR(device)) {
- err = PTR_ERR(device);
- goto errout;
+ if (IS_ERR(device))
+ continue;
+ if (!platform_get_drvdata(device)) {
+ platform_device_unregister(device);
+ continue;
}
devices[i] = device;
cards++;
}
devices[i] = device;
cards++;
@@
-262,14
+266,10
@@
static int __init alsa_card_gusclassic_init(void)
#ifdef MODULE
printk(KERN_ERR "GUS Classic soundcard not found or device busy\n");
#endif
#ifdef MODULE
printk(KERN_ERR "GUS Classic soundcard not found or device busy\n");
#endif
-
err = -ENODEV
;
-
goto errout
;
+
snd_gusclassic_unregister_all()
;
+
return -ENODEV
;
}
return 0;
}
return 0;
-
- errout:
- snd_gusclassic_unregister_all();
- return err;
}
static void __exit alsa_card_gusclassic_exit(void)
}
static void __exit alsa_card_gusclassic_exit(void)