Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[powerpc.git] / sound / isa / cmi8330.c

diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index 35780b8..3c1e9fd 100644 (file)
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -701,6 +701,10 @@ static int __init alsa_card_cmi8330_init(void)
                                                         i, NULL, 0);
                if (IS_ERR(device))
                        continue;
+               if (!platform_get_drvdata(device)) {
+                       platform_device_unregister(device);
+                       continue;
+               }
                platform_devices[i] = device;
                cards++;
        }