[ALSA] continue on IS_ERR from platform device registration

I previously only concerned myself with sound/isa. When I now checked
for more platform_device_register_simple() usages in ALSA I found a
couple more drivers that needed the same patches as already submitted
for all the ISA drivers.
This first one is the continue-on-iserr patch for sound/drivers. This
gets them all.

Signed-off-by: Rene Herman <rene.herman@keyaccess.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index e35fd5779a9d7b9e65025df4e6622fed24390ca9..ae0df549fac7763843412746622681a1bad1d440 100644 (file)
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -675,10 +675,8 @@ static int __init alsa_card_dummy_init(void)
                        continue;
                device = platform_device_register_simple(SND_DUMMY_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                devices[i] = device;
                cards++;
        }
@@ -686,14 +684,10 @@ static int __init alsa_card_dummy_init(void)
 #ifdef MODULE
                printk(KERN_ERR "Dummy soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_dummy_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_dummy_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_dummy_exit(void)

diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 9ea3059a706499cd0da280fa63c1ce60f7ae1923..da7ef26995c3d9ae3ea73e254d9bc8ef16666954 100644 (file)
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -251,10 +251,8 @@ static int __init alsa_card_mpu401_init(void)
 #endif
                device = platform_device_register_simple(SND_MPU401_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                platform_devices[i] = device;
                snd_mpu401_devices++;
        }
@@ -266,14 +264,10 @@ static int __init alsa_card_mpu401_init(void)
 #ifdef MODULE
                printk(KERN_ERR "MPU-401 device not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_mpu401_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_mpu401_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_mpu401_exit(void)

diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 1a7fbefe4740de3e013a262fbbf34e85956c76fd..c01b4c5118b909b1555d8b7e3c8147468ef393f2 100644 (file)
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -996,10 +996,8 @@ 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;
                devices[i] = device;
                cards++;
        }
@@ -1007,14 +1005,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)

diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index a3ee306239c92930f4a1baaf86b0bde96a977138..26eb2499d442667e18ff3229f07551e73606bea1 100644 (file)
--- 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)