linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / drivers / dummy.c

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index ffeafaf..14e1a67 100644 (file)
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -669,17 +669,13 @@ static int __init alsa_card_dummy_init(void)
                return err;
 
        cards = 0;
-       for (i = 0; i < SNDRV_CARDS; i++) {
+       for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
                struct platform_device *device;
-               if (! enable[i])
-                       continue;
                device = platform_device_register_simple(SND_DUMMY_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device))
-                       continue;
-               if (!platform_get_drvdata(device)) {
-                       platform_device_unregister(device);
-                       continue;
+               if (IS_ERR(device)) {
+                       err = PTR_ERR(device);
+                       goto errout;
                }
                devices[i] = device;
                cards++;
@@ -688,10 +684,14 @@ static int __init alsa_card_dummy_init(void)
 #ifdef MODULE
                printk(KERN_ERR "Dummy soundcard not found or device busy\n");
 #endif
-               snd_dummy_unregister_all();
-               return -ENODEV;
+               err = -ENODEV;
+               goto errout;
        }
        return 0;
+
+ errout:
+       snd_dummy_unregister_all();
+       return err;
 }
 
 static void __exit alsa_card_dummy_exit(void)