[ALSA] mpu401_uart - Fix coding style and code clean up

[linux-2.6-omap-h63xx.git] / sound / drivers / virmidi.c

diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index a3ee306239c92930f4a1baaf86b0bde96a977138..72d09b304db075711f1bceb5b003a8118e9658cc 100644 (file)
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -65,7 +65,7 @@ MODULE_SUPPORTED_DEVICE("{{ALSA,Virtual rawmidi device}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;     /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;      /* ID for this card */
-static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+static int enable[SNDRV_CARDS];
 static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
 
 module_param_array(index, int, NULL, 0444);
@@ -169,9 +169,11 @@ 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;
+               if (!platform_get_drvdata(device)) {
+                       platform_device_unregister(device);
+                       continue;
                }
                devices[i] = device;
                cards++;
@@ -180,14 +182,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)