X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fisa%2Fdt019x.c;h=50e7bc5ef561edfb89efd8f33f8b29b868b45c3e;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=0acb4e5da47f46752586712e62833d37b41910ed;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git diff --git a/sound/isa/dt019x.c b/sound/isa/dt019x.c index 0acb4e5da..50e7bc5ef 100644 --- a/sound/isa/dt019x.c +++ b/sound/isa/dt019x.c @@ -272,8 +272,6 @@ 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) { @@ -287,7 +285,6 @@ static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card, if (res < 0) return res; dev++; - dt019x_devices++; return 0; } return -ENODEV; @@ -339,13 +336,10 @@ static struct pnp_card_driver dt019x_pnpc_driver = { static int __init alsa_card_dt019x_init(void) { - int err; - - err = pnp_register_card_driver(&dt019x_pnpc_driver); - if (err) - return err; + int cards = 0; - if (!dt019x_devices) { + cards = pnp_register_card_driver(&dt019x_pnpc_driver); + if (cards <= 0) { pnp_unregister_card_driver(&dt019x_pnpc_driver); #ifdef MODULE snd_printk(KERN_ERR "no DT-019X / ALS-007 based soundcards found\n");