提交 6736a658 编写于 作者: B Bjorn Helgaas 提交者: Linus Torvalds

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

Remove the assumption that pnp_register_card_driver() returns the
number of devices claimed.
Signed-off-by: NBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Acked-by: NTakashi Iwai <tiwai@suse.de>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 07d58ad0
...@@ -272,6 +272,8 @@ static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard, ...@@ -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, ...@@ -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 = { ...@@ -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;
err = pnp_register_card_driver(&dt019x_pnpc_driver);
if (err)
return err;
cards = pnp_register_card_driver(&dt019x_pnpc_driver); if (!dt019x_devices) {
if (cards <= 0) {
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");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册