lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] PNP: adjust pnp_register_card_driver() signature: als100

Browse Source 
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>
This commit is contained in:
Bjorn Helgaas
2006-03-27 01:17:09 -08:00
committed by Linus Torvalds
parent 5f53f4e210
commit 51427ec0f2
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound/isa/als100.c
View File

@@ -199,7 +199,7 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
return 0; 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, struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
@@ -281,6 +281,8 @@ static int __init snd_card_als100_probe(int dev,
return 0; return 0;
} }
static unsigned int __devinitdata als100_devices;
static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card, static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
const struct pnp_card_device_id *id) 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) if (res < 0)
return res; return res;
dev++; dev++;
als100_devices++;
return 0; return 0;
} }
return -ENODEV; return -ENODEV;
@@ -345,10 +348,13 @@ static struct pnp_card_driver als100_pnpc_driver = {
static int __init alsa_card_als100_init(void) static int __init alsa_card_als100_init(void)
{ {
int cards; int err;
cards = pnp_register_card_driver(&als100_pnpc_driver); err = pnp_register_card_driver(&als100_pnpc_driver);
if (cards <= 0) { if (err)
return err;
if (!als100_devices) {
pnp_unregister_card_driver(&als100_pnpc_driver); pnp_unregister_card_driver(&als100_pnpc_driver);
#ifdef MODULE #ifdef MODULE
snd_printk(KERN_ERR "no ALS100 based soundcards found\n"); snd_printk(KERN_ERR "no ALS100 based soundcards found\n");