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

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>

1 files changed, 9 insertions, 3 deletions

diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c
index a530691bf4f7..15e59283aac6 100644
--- a/sound/isa/azt2320.c
+++ b/sound/isa/azt2320.c
@@ -310,6 +310,8 @@ static int __devinit snd_card_azt2320_probe(int dev,
         return 0;
 }
 
+static unsigned int __devinitdata azt2320_devices;
+
 static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
                                             const struct pnp_card_device_id *id)
 {
@@ -323,6 +325,7 @@ static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
                 if (res < 0)
                         return res;
                 dev++;
+                azt2320_devices++;
                 return 0;
         }
         return -ENODEV;
@@ -372,10 +375,13 @@ static struct pnp_card_driver azt2320_pnpc_driver = {
 
 static int __init alsa_card_azt2320_init(void)
 {
-        int cards;
+        int err;
+
+        err = pnp_register_card_driver(&azt2320_pnpc_driver);
+        if (err)
+                return err;
 
-        cards = pnp_register_card_driver(&azt2320_pnpc_driver);
-        if (cards <= 0) {
+        if (!azt2320_devices) {
                 pnp_unregister_card_driver(&azt2320_pnpc_driver);
 #ifdef MODULE
                 snd_printk(KERN_ERR "no AZT2320 based soundcards found\n");