Merge ../linux-2.6

1 files changed, 4 insertions, 10 deletions

diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index a3ee306239c..26eb2499d44 100644
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -169,10 +169,8 @@ static int __init alsa_card_virmidi_init(void)
                         continue;
                 device = platform_device_register_simple(SND_VIRMIDI_DRIVER,
                                                          i, NULL, 0);
-                if (IS_ERR(device)) {
-                        err = PTR_ERR(device);
-                        goto errout;
-                }
+                if (IS_ERR(device))
+                        continue;
                 devices[i] = device;
                 cards++;
         }
@@ -180,14 +178,10 @@ static int __init alsa_card_virmidi_init(void)
 #ifdef MODULE
                 printk(KERN_ERR "Card-VirMIDI soundcard not found or device busy\n");
 #endif
-                err = -ENODEV;
-                goto errout;
+                snd_virmidi_unregister_all();
+                return -ENODEV;
         }
         return 0;
-
- errout:
-        snd_virmidi_unregister_all();
-        return err;
 }
 
 static void __exit alsa_card_virmidi_exit(void)