evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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:12 -08:00 • committed by Linus Torvalds
parent 07d58ad06b
commit 6736a6587b
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/dt019x.c
View file

@ -272,6 +272,8 @@ static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard,
return 0; return 0;
} }
static unsigned int __devinitdata dt019x_devices;
static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card, static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
@ -285,6 +287,7 @@ static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
if (res < 0) if (res < 0)
return res; return res;
dev++; dev++;
dt019x_devices++;
return 0; return 0;
} }
return -ENODEV; return -ENODEV;
@ -336,10 +339,13 @@ static struct pnp_card_driver dt019x_pnpc_driver = {
static int __init alsa_card_dt019x_init(void) static int __init alsa_card_dt019x_init(void)
{ {
int cards = 0; int err;
cards = pnp_register_card_driver(&dt019x_pnpc_driver); err = pnp_register_card_driver(&dt019x_pnpc_driver);
if (cards <= 0) { if (err)
return err;
if (!dt019x_devices) {
pnp_unregister_card_driver(&dt019x_pnpc_driver); pnp_unregister_card_driver(&dt019x_pnpc_driver);
#ifdef MODULE #ifdef MODULE
snd_printk(KERN_ERR "no DT-019X / ALS-007 based soundcards found\n"); snd_printk(KERN_ERR "no DT-019X / ALS-007 based soundcards found\n");