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
/
azt2320.c
diff --git
a/sound/isa/azt2320.c
b/sound/isa/azt2320.c
index
15e5928
..
a530691
100644
(file)
--- a/
sound/isa/azt2320.c
+++ b/
sound/isa/azt2320.c
@@
-310,8
+310,6
@@
static int __devinit snd_card_azt2320_probe(int dev,
return 0;
}
return 0;
}
-static unsigned int __devinitdata azt2320_devices;
-
static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
const struct pnp_card_device_id *id)
{
static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
const struct pnp_card_device_id *id)
{
@@
-325,7
+323,6
@@
static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
if (res < 0)
return res;
dev++;
if (res < 0)
return res;
dev++;
- azt2320_devices++;
return 0;
}
return -ENODEV;
return 0;
}
return -ENODEV;
@@
-375,13
+372,10
@@
static struct pnp_card_driver azt2320_pnpc_driver = {
static int __init alsa_card_azt2320_init(void)
{
static int __init alsa_card_azt2320_init(void)
{
- int err;
-
- err = pnp_register_card_driver(&azt2320_pnpc_driver);
- if (err)
- return err;
+ int cards;
- if (!azt2320_devices) {
+ cards = pnp_register_card_driver(&azt2320_pnpc_driver);
+ if (cards <= 0) {
pnp_unregister_card_driver(&azt2320_pnpc_driver);
#ifdef MODULE
snd_printk(KERN_ERR "no AZT2320 based soundcards found\n");
pnp_unregister_card_driver(&azt2320_pnpc_driver);
#ifdef MODULE
snd_printk(KERN_ERR "no AZT2320 based soundcards found\n");