Skip to content

Commit

Permalink
[PATCH] PNP: adjust pnp_register_card_driver() signature: dt019x
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas authored and Linus Torvalds committed Mar 27, 2006
1 parent 07d58ad commit 6736a65
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions sound/isa/dt019x.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard,
return 0;
}

static unsigned int __devinitdata dt019x_devices;

static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
const struct pnp_card_device_id *pid)
{
Expand All @@ -285,6 +287,7 @@ static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
if (res < 0)
return res;
dev++;
dt019x_devices++;
return 0;
}
return -ENODEV;
Expand Down Expand Up @@ -336,10 +339,13 @@ static struct pnp_card_driver dt019x_pnpc_driver = {

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 (cards <= 0) {
if (!dt019x_devices) {
pnp_unregister_card_driver(&dt019x_pnpc_driver);
#ifdef MODULE
snd_printk(KERN_ERR "no DT-019X / ALS-007 based soundcards found\n");
Expand Down

0 comments on commit 6736a65

Please sign in to comment.