Messages in this thread Patch in this message | | | From | Bjorn Helgaas <> | Subject | [PATCH 1/12] PNP: adjust pnp_register_card_driver() signature | Date | Wed, 22 Mar 2006 15:12:06 -0700 |
| |
Remove the assumption that pnp_register_card_driver() returns the number of devices claimed.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Index: work-mm5/sound/isa/ad1816a/ad1816a.c =================================================================== --- work-mm5.orig/sound/isa/ad1816a/ad1816a.c 2006-03-22 09:57:34.000000000 -0700 +++ work-mm5/sound/isa/ad1816a/ad1816a.c 2006-03-22 10:10:34.000000000 -0700 @@ -262,6 +262,8 @@ return 0; } +static unsigned int __devinitdata ad1816a_devices; + static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card, const struct pnp_card_device_id *id) { @@ -275,6 +277,7 @@ if (res < 0) return res; dev++; + ad1816a_devices++; return 0; } return -ENODEV; @@ -297,10 +300,13 @@ static int __init alsa_card_ad1816a_init(void) { - int cards; + int err; + + err = pnp_register_card_driver(&ad1816a_pnpc_driver); + if (err) + return err; - cards = pnp_register_card_driver(&ad1816a_pnpc_driver); - if (cards <= 0) { + if (!ad1816a_devices) { pnp_unregister_card_driver(&ad1816a_pnpc_driver); #ifdef MODULE printk(KERN_ERR "no AD1816A based soundcards found.\n"); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |