Merge branch 'master'

2 files changed, 14 insertions, 18 deletions

diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index a30dcd962525..397310f358b7 100644
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -209,9 +209,11 @@ static int __init alsa_card_cs4231_init(void)
                         continue;
                 device = platform_device_register_simple(SND_CS4231_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++;
@@ -220,14 +222,10 @@ static int __init alsa_card_cs4231_init(void)
 #ifdef MODULE
                 printk(KERN_ERR "CS4231 soundcard not found or device busy\n");
 #endif
-                err = -ENODEV;
-                goto errout;
+                snd_cs4231_unregister_all();
+                return -ENODEV;
         }
         return 0;
-
- errout:
-        snd_cs4231_unregister_all();
-        return err;
 }
 
 static void __exit alsa_card_cs4231_exit(void)
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 382bb17ef49f..f7fa779347ff 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -780,9 +780,11 @@ static int __init alsa_card_cs423x_init(void)
                         continue;
                 device = platform_device_register_simple(CS423X_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;
                 }
                 platform_devices[i] = device;
                 snd_cs423x_devices++;
@@ -802,14 +804,10 @@ static int __init alsa_card_cs423x_init(void)
 #ifdef MODULE
                 printk(KERN_ERR IDENT " soundcard not found or device busy\n");
 #endif
-                err = -ENODEV;
-                goto errout;
+                snd_cs423x_unregister_all();
+                return -ENODEV;
         }
         return 0;
-
- errout:
-        snd_cs423x_unregister_all();
-        return err;
 }
 
 static void __exit alsa_card_cs423x_exit(void)