diff options
| author | Bjorn Helgaas | 2006-03-27 11:17:09 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-03-27 18:44:53 +0200 |
| commit | 51427ec0f222cb73b21f3849416a95d751bdd742 (patch) | |
| tree | 7915818c4cb5e268e8c317eed9c89f28d290f175 /sound | |
| parent | [PATCH] PNP: adjust pnp_register_card_driver() signature: ad1816a (diff) | |
| download | kernel-qcow2-linux-51427ec0f222cb73b21f3849416a95d751bdd742.tar.gz kernel-qcow2-linux-51427ec0f222cb73b21f3849416a95d751bdd742.tar.xz kernel-qcow2-linux-51427ec0f222cb73b21f3849416a95d751bdd742.zip | |
[PATCH] PNP: adjust pnp_register_card_driver() signature: als100
Remove the assumption that pnp_register_card_driver() returns the
number of devices claimed. And fix a __init/__devinit issue.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Acked-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/isa/als100.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sound/isa/als100.c b/sound/isa/als100.c index 9b77c17b3f66..a52bd8a14c9b 100644 --- a/sound/isa/als100.c +++ b/sound/isa/als100.c @@ -199,7 +199,7 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard, return 0; } -static int __init snd_card_als100_probe(int dev, +static int __devinit snd_card_als100_probe(int dev, struct pnp_card_link *pcard, const struct pnp_card_device_id *pid) { @@ -281,6 +281,8 @@ static int __init snd_card_als100_probe(int dev, return 0; } +static unsigned int __devinitdata als100_devices; + static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card, const struct pnp_card_device_id *id) { @@ -294,6 +296,7 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card, if (res < 0) return res; dev++; + als100_devices++; return 0; } return -ENODEV; @@ -345,10 +348,13 @@ static struct pnp_card_driver als100_pnpc_driver = { static int __init alsa_card_als100_init(void) { - int cards; + int err; + + err = pnp_register_card_driver(&als100_pnpc_driver); + if (err) + return err; - cards = pnp_register_card_driver(&als100_pnpc_driver); - if (cards <= 0) { + if (!als100_devices) { pnp_unregister_card_driver(&als100_pnpc_driver); #ifdef MODULE snd_printk(KERN_ERR "no ALS100 based soundcards found\n"); |