4 files changed, 16 insertions, 40 deletions

diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c
index 26dccfea2437..ed34427c49db 100644
--- a/sound/isa/gus/gusclassic.c
+++ b/sound/isa/gus/gusclassic.c
@@ -253,10 +253,8 @@ static int __init alsa_card_gusclassic_init(void)
                         continue;
                 device = platform_device_register_simple(GUSCLASSIC_DRIVER,
                                                          i, NULL, 0);
-                if (IS_ERR(device)) {
-                        err = PTR_ERR(device);
-                        goto errout;
-                }
+                if (IS_ERR(device))
+                        continue;
                 devices[i] = device;
                 cards++;
         }
@@ -264,14 +262,10 @@ static int __init alsa_card_gusclassic_init(void)
 #ifdef MODULE
                 printk(KERN_ERR "GUS Classic soundcard not found or device busy\n");
 #endif
-                err = -ENODEV;
-                goto errout;
+                snd_gusclassic_unregister_all();
+                return -ENODEV;
         }
         return 0;
-
- errout:
-        snd_gusclassic_unregister_all();
-        return err;
 }
 
 static void __exit alsa_card_gusclassic_exit(void)
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index 31dc20501d0c..aa312dee99c8 100644
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -363,10 +363,8 @@ static int __init alsa_card_gusextreme_init(void)
                         continue;
                 device = platform_device_register_simple(GUSEXTREME_DRIVER,
                                                          i, NULL, 0);
-                if (IS_ERR(device)) {
-                        err = PTR_ERR(device);
-                        goto errout;
-                }
+                if (IS_ERR(device))
+                        continue;
                 devices[i] = device;
                 cards++;
         }
@@ -374,14 +372,10 @@ static int __init alsa_card_gusextreme_init(void)
 #ifdef MODULE
                 printk(KERN_ERR "GUS Extreme soundcard not found or device busy\n");
 #endif
-                err = -ENODEV;
-                goto errout;
+                snd_gusextreme_unregister_all();
+                return -ENODEV;
         }
         return 0;
-
- errout:
-        snd_gusextreme_unregister_all();
-        return err;
 }
 
 static void __exit alsa_card_gusextreme_exit(void)
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index cafb9b67fa72..a733fabf653a 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -390,10 +390,8 @@ static int __init alsa_card_gusmax_init(void)
                         continue;
                 device = platform_device_register_simple(GUSMAX_DRIVER,
                                                          i, NULL, 0);
-                if (IS_ERR(device)) {
-                        err = PTR_ERR(device);
-                        goto errout;
-                }
+                if (IS_ERR(device))
+                        continue;
                 devices[i] = device;
                 cards++;
         }
@@ -401,14 +399,10 @@ static int __init alsa_card_gusmax_init(void)
 #ifdef MODULE
                 printk(KERN_ERR "GUS MAX soundcard not found or device busy\n");
 #endif
-                err = -ENODEV;
-                goto errout;
+                snd_gusmax_unregister_all();
+                return -ENODEV;
         }
         return 0;
-
- errout:
-        snd_gusmax_unregister_all();
-        return err;
 }
 
 static void __exit alsa_card_gusmax_exit(void)
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index de71b7a99c83..4be472ea99d2 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -947,10 +947,8 @@ static int __init alsa_card_interwave_init(void)
 #endif
                 device = platform_device_register_simple(INTERWAVE_DRIVER,
                                                          i, NULL, 0);
-                if (IS_ERR(device)) {
-                        err = PTR_ERR(device);
-                        goto errout;
-                }
+                if (IS_ERR(device))
+                        continue;
                 platform_devices[i] = device;
                 cards++;
         }
@@ -966,14 +964,10 @@ static int __init alsa_card_interwave_init(void)
 #ifdef MODULE
                 printk(KERN_ERR "InterWave soundcard not found or device busy\n");
 #endif
-                err = -ENODEV;
-                goto errout;
+                snd_interwave_unregister_all();
+                return -ENODEV;
         }
         return 0;
-
- errout:
-        snd_interwave_unregister_all();
-        return err;
 }
 
 static void __exit alsa_card_interwave_exit(void)