[PATCH] pnp: cs4232: adjust pnp_register_driver signature

Remove the assumption that pnp_register_driver() returns the number of devices
claimed.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 10 insertions, 5 deletions

diff --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c
index 7c59e2d4003a..c7f86f09c28d 100644
--- a/sound/oss/cs4232.c
+++ b/sound/oss/cs4232.c
@@ -360,6 +360,8 @@ static int __initdata synthio	= -1;
 static int __initdata synthirq  = -1;
 static int __initdata isapnp    = 1;
 
+static unsigned int cs4232_devices;
+
 MODULE_DESCRIPTION("CS4232 based soundcard driver"); 
 MODULE_AUTHOR("Hannu Savolainen, Paul Barton-Davis"); 
 MODULE_LICENSE("GPL");
@@ -421,6 +423,7 @@ static int cs4232_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev
                 return -ENODEV;
         }
         pnp_set_drvdata(dev,isapnpcfg);
+        cs4232_devices++;
         return 0;
 }
 
@@ -455,10 +458,11 @@ static int __init init_cs4232(void)
 #endif
         cfg.irq = -1;
 
-        if (isapnp &&
-            (pnp_register_driver(&cs4232_driver) > 0)
-        )
-                return 0;
+        if (isapnp) {
+                pnp_register_driver(&cs4232_driver);
+                if (cs4232_devices)
+                        return 0;
+        }
 
         if(io==-1||irq==-1||dma==-1)
         {
@@ -503,7 +507,8 @@ static int __init setup_cs4232(char *str)
         int ints[7];
 
         /* If we have isapnp cards, no need for options */
-        if (pnp_register_driver(&cs4232_driver) > 0)
+        pnp_register_driver(&cs4232_driver);
+        if (cs4232_devices)
                 return 1;
         
         str = get_options(str, ARRAY_SIZE(ints), ints);