leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Remove the assumption that pnp_register_card_driver() returns the
number of devices claimed.

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:08 -08:00 committed by Linus Torvalds
parent 982c609448
commit 5f53f4e210
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/isa/ad1816a/ad1816a.c
View File

@ -262,6 +262,8 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
return 0; return 0;
} }
static unsigned int __devinitdata ad1816a_devices;
static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card, static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *id)
{ {
@ -275,6 +277,7 @@ static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
if (res < 0) if (res < 0)
return res; return res;
dev++; dev++;
ad1816a_devices++;
return 0; return 0;
} }
return -ENODEV; return -ENODEV;
@ -297,10 +300,13 @@ static struct pnp_card_driver ad1816a_pnpc_driver = {
static int __init alsa_card_ad1816a_init(void) static int __init alsa_card_ad1816a_init(void)
{ {
int cards; int err;
cards = pnp_register_card_driver(&ad1816a_pnpc_driver); err = pnp_register_card_driver(&ad1816a_pnpc_driver);
if (cards <= 0) { if (err)
return err;
if (!ad1816a_devices) {
pnp_unregister_card_driver(&ad1816a_pnpc_driver); pnp_unregister_card_driver(&ad1816a_pnpc_driver);
#ifdef MODULE #ifdef MODULE
printk(KERN_ERR "no AD1816A based soundcards found.\n"); printk(KERN_ERR "no AD1816A based soundcards found.\n");