X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fdrivers%2Fvirmidi.c;h=4258723de2ab85d242e87465cf5fe2ce2e03e85f;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=26eb2499d442667e18ff3229f07551e73606bea1;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index 26eb2499d..4258723de 100644
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -163,14 +163,14 @@ static int __init alsa_card_virmidi_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_VIRMIDI_DRIVER,
 							 i, NULL, 0);
-		if (IS_ERR(device))
-			continue;
+		if (IS_ERR(device)) {
+			err = PTR_ERR(device);
+			goto errout;
+		}
 		devices[i] = device;
 		cards++;
 	}
@@ -178,10 +178,14 @@ static int __init alsa_card_virmidi_init(void)
 #ifdef MODULE
 		printk(KERN_ERR "Card-VirMIDI soundcard not found or device busy\n");
 #endif
-		snd_virmidi_unregister_all();
-		return -ENODEV;
+		err = -ENODEV;
+		goto errout;
 	}
 	return 0;
+
+ errout:
+	snd_virmidi_unregister_all();
+	return err;
 }
 
 static void __exit alsa_card_virmidi_exit(void)