X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fpcmcia%2Fcs.c;h=e82859d3227a61e661d159acaf8b3d1c51a7f9fa;hb=bf45d9b0ac108b11245203ebb082d30f5059846b;hp=0ff4d6ec8b770eb0b7a43dbe68efb96a3718d9e5;hpb=33519ddd43f4adc221ee7b2801dedd19ac97540b;p=linux-2.6

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 0ff4d6ec8b..e82859d322 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -903,17 +903,29 @@ static int pcmcia_socket_hotplug(struct class_device *dev, char **envp,
 }
 
 
+static struct completion pcmcia_unload;
+
+static void pcmcia_release_socket_class(struct class *data)
+{
+	complete(&pcmcia_unload);
+}
+
+
 struct class pcmcia_socket_class = {
 	.name = "pcmcia_socket",
         .hotplug = pcmcia_socket_hotplug,
 	.release = pcmcia_release_socket,
+	.class_release = pcmcia_release_socket_class,
 };
 EXPORT_SYMBOL(pcmcia_socket_class);
 
 
 static int __init init_pcmcia_cs(void)
 {
-	int ret = class_register(&pcmcia_socket_class);
+	int ret;
+
+	init_completion(&pcmcia_unload);
+	ret = class_register(&pcmcia_socket_class);
 	if (ret)
 		return (ret);
 	return class_interface_register(&pccard_sysfs_interface);
@@ -923,6 +935,8 @@ static void __exit exit_pcmcia_cs(void)
 {
 	class_interface_unregister(&pccard_sysfs_interface);
 	class_unregister(&pcmcia_socket_class);
+
+	wait_for_completion(&pcmcia_unload);
 }
 
 subsys_initcall(init_pcmcia_cs);