[ALSA] continue on IS_ERR from platform device registration

[safe/jmp/linux-2.6] / sound / isa / cs423x / cs4231.c

diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index b5252a5..073dac9 100644 (file)
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -66,6 +66,8 @@ MODULE_PARM_DESC(dma1, "DMA1 # for CS4231 driver.");
 module_param_array(dma2, int, NULL, 0444);
 MODULE_PARM_DESC(dma2, "DMA2 # for CS4231 driver.");
 
+static struct platform_device *devices[SNDRV_CARDS];
+
 
 static int __init snd_cs4231_probe(struct platform_device *pdev)
 {
@@ -183,6 +185,15 @@ static struct platform_driver snd_cs4231_driver = {
        },
 };
 
+static void __init_or_module snd_cs4231_unregister_all(void)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(devices); ++i)
+               platform_device_unregister(devices[i]);
+       platform_driver_unregister(&snd_cs4231_driver);
+}
+
 static int __init alsa_card_cs4231_init(void)
 {
        int i, cards, err;
@@ -192,33 +203,30 @@ static int __init alsa_card_cs4231_init(void)
                return err;
 
        cards = 0;
-       for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
+       for (i = 0; i < SNDRV_CARDS; i++) {
                struct platform_device *device;
+               if (! enable[i])
+                       continue;
                device = platform_device_register_simple(SND_CS4231_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
+               devices[i] = device;
                cards++;
        }
        if (!cards) {
 #ifdef MODULE
                printk(KERN_ERR "CS4231 soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_cs4231_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       platform_driver_unregister(&snd_cs4231_driver);
-       return err;
 }
 
 static void __exit alsa_card_cs4231_exit(void)
 {
-       platform_driver_unregister(&snd_cs4231_driver);
+       snd_cs4231_unregister_all();
 }
 
 module_init(alsa_card_cs4231_init)