Merge branch 'master'

1 files changed, 7 insertions, 4 deletions

diff --git a/sound/isa/adlib.c b/sound/isa/adlib.c
index a253a14e6a45..1124344ed948 100644
--- a/sound/isa/adlib.c
+++ b/sound/isa/adlib.c
@@ -43,8 +43,7 @@ static int __devinit snd_adlib_probe(struct platform_device *device)
         struct snd_card *card;
         struct snd_opl3 *opl3;
 
-        int error;
-        int i = device->id;
+        int error, i = device->id;
 
         if (port[i] == SNDRV_AUTO_PORT) {
                 snd_printk(KERN_ERR DRV_NAME ": please specify port\n");
@@ -95,8 +94,7 @@ static int __devinit snd_adlib_probe(struct platform_device *device)
         return 0;
 
 out1:   snd_card_free(card);
- out0:  error = -EINVAL; /* FIXME: should be the original error code */
-        return error;
+out0:   return error;
 }
 
 static int __devexit snd_adlib_remove(struct platform_device *device)
@@ -134,6 +132,11 @@ static int __init alsa_card_adlib_init(void)
                 if (IS_ERR(device))
                         continue;
 
+                if (!platform_get_drvdata(device)) {
+                        platform_device_unregister(device);
+                        continue;
+                }
+
                 devices[i] = device;
                 cards++;
         }