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
/
oss
/
sb_card.c
diff --git
a/sound/oss/sb_card.c
b/sound/oss/sb_card.c
index
8666291
..
680b82e
100644
(file)
--- a/
sound/oss/sb_card.c
+++ b/
sound/oss/sb_card.c
@@
-22,6
+22,7
@@
* 02-07-2003 Bug made it into first release. Take two.
*/
* 02-07-2003 Bug made it into first release. Take two.
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
@@
-51,7
+52,6
@@
static int __initdata sm_games = 0; /* Logitech soundman games? */
static struct sb_card_config *legacy = NULL;
#ifdef CONFIG_PNP
static struct sb_card_config *legacy = NULL;
#ifdef CONFIG_PNP
-static int pnp_registered;
static int __initdata pnp = 1;
/*
static int __initdata uart401 = 0;
static int __initdata pnp = 1;
/*
static int __initdata uart401 = 0;
@@
-133,7
+133,7
@@
static void sb_unload(struct sb_card_config *scc)
}
/* Register legacy card with OSS subsystem */
}
/* Register legacy card with OSS subsystem */
-static int
__init
sb_init_legacy(void)
+static int sb_init_legacy(void)
{
struct sb_module_options sbmo = {0};
{
struct sb_module_options sbmo = {0};
@@
-234,8
+234,6
@@
static void sb_dev2cfg(struct pnp_dev *dev, struct sb_card_config *scc)
}
}
}
}
-static unsigned int sb_pnp_devices;
-
/* Probe callback function for the PnP API */
static int sb_pnp_probe(struct pnp_card_link *card, const struct pnp_card_device_id *card_id)
{
/* Probe callback function for the PnP API */
static int sb_pnp_probe(struct pnp_card_link *card, const struct pnp_card_device_id *card_id)
{
@@
-266,7
+264,6
@@
static int sb_pnp_probe(struct pnp_card_link *card, const struct pnp_card_device
scc->conf.dma, scc->conf.dma2);
pnp_set_card_drvdata(card, scc);
scc->conf.dma, scc->conf.dma2);
pnp_set_card_drvdata(card, scc);
- sb_pnp_devices++;
return sb_register_oss(scc, &sbmo);
}
return sb_register_oss(scc, &sbmo);
}
@@
-292,14
+289,6
@@
static struct pnp_card_driver sb_pnp_driver = {
MODULE_DEVICE_TABLE(pnp_card, sb_pnp_card_table);
#endif /* CONFIG_PNP */
MODULE_DEVICE_TABLE(pnp_card, sb_pnp_card_table);
#endif /* CONFIG_PNP */
-static void __init_or_module sb_unregister_all(void)
-{
-#ifdef CONFIG_PNP
- if (pnp_registered)
- pnp_unregister_card_driver(&sb_pnp_driver);
-#endif
-}
-
static int __init sb_init(void)
{
int lres = 0;
static int __init sb_init(void)
{
int lres = 0;
@@
-318,18
+307,17
@@
static int __init sb_init(void)
#ifdef CONFIG_PNP
if(pnp) {
#ifdef CONFIG_PNP
if(pnp) {
- int err = pnp_register_card_driver(&sb_pnp_driver);
- if (!err)
- pnp_registered = 1;
- pres = sb_pnp_devices;
+ pres = pnp_register_card_driver(&sb_pnp_driver);
}
#endif
printk(KERN_INFO "sb: Init: Done\n");
/* If either PnP or Legacy registered a card then return
* success */
}
#endif
printk(KERN_INFO "sb: Init: Done\n");
/* If either PnP or Legacy registered a card then return
* success */
- if (pres == 0 && lres <= 0) {
- sb_unregister_all();
+ if (pres <= 0 && lres <= 0) {
+#ifdef CONFIG_PNP
+ pnp_unregister_card_driver(&sb_pnp_driver);
+#endif
return -ENODEV;
}
return 0;
return -ENODEV;
}
return 0;
@@
-345,10
+333,14
@@
static void __exit sb_exit(void)
sb_unload(legacy);
}
sb_unload(legacy);
}
- sb_unregister_all();
+#ifdef CONFIG_PNP
+ pnp_unregister_card_driver(&sb_pnp_driver);
+#endif
- vfree(smw_free);
- smw_free = NULL;
+ if (smw_free) {
+ vfree(smw_free);
+ smw_free = NULL;
+ }
}
module_init(sb_init);
}
module_init(sb_init);