---

yaml --- r: 182009 b: refs/heads/master c: d801c14 h: refs/heads/master i: 182007: 8fe3c5f v: v3
git-mirror · Feb 17, 2010 · f85a1cc · f85a1cc
1 parent 7600a38
commit f85a1cc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d700518a0e4d17a47321414e5e487ed53f4ae752
+refs/heads/master: d801c1409ef7d45339cbe8ac9de28ade6ed4699a
diff --git a/trunk/drivers/pcmcia/cs.c b/trunk/drivers/pcmcia/cs.c
@@ -689,6 +689,9 @@ static int pccardd(void *__skt)
 
 	complete(&skt->thread_done);
 
+	/* wait for userspace to catch up */
+	msleep(250);
+
 	set_freezable();
 	for (;;) {
 		unsigned long flags;

diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c
@@ -1356,12 +1356,6 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
 		return -ENODEV;
 	}
 
-	/*
-	 * Ugly. But we want to wait for the socket threads to have started up.
-	 * We really should let the drivers themselves drive some of this..
-	 */
-	msleep(250);
-
 	ret = sysfs_create_bin_file(&dev->kobj, &pccard_cis_attr);
 	if (ret) {
 		dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");