Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / sound / isa / sscape.c

diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 532f6e0eff0b72c4f58896101009a4a78dd6366c..d2a856f0fde201d20e47da42d3960dea8d6537cd 100644 (file)
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -1438,6 +1438,10 @@ static int __init sscape_manual_probe(void)
                                                         i, NULL, 0);
                if (IS_ERR(device))
                        continue;
+               if (!platform_get_drvdata(device)) {
+                       platform_device_unregister(device);
+                       continue;
+               }
                platform_devices[i] = device;
        }
        return 0;