Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6] / sound / drivers / serial-u16550.c

diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 1a7fbefe4740de3e013a262fbbf34e85956c76fd..2330fec505daf952deb09041eae0a8f3c305f85e 100644 (file)
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -996,9 +996,11 @@ static int __init alsa_card_serial_init(void)
                        continue;
                device = platform_device_register_simple(SND_SERIAL_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++;
@@ -1007,14 +1009,10 @@ static int __init alsa_card_serial_init(void)
 #ifdef MODULE
                printk(KERN_ERR "serial midi soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_serial_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_serial_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_serial_exit(void)