From f85a1cc7199e8ecbdf338d7d9926d3ae6183cccf Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Wed, 17 Feb 2010 11:02:22 +0100
Subject: [PATCH] --- yaml --- r: 182009 b: refs/heads/master c:
 d801c1409ef7d45339cbe8ac9de28ade6ed4699a h: refs/heads/master i:   182007:
 8fe3c5f6bf2fce24bf06ef91d1f57fd3df1bf501 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pcmcia/cs.c | 3 +++
 trunk/drivers/pcmcia/ds.c | 6 ------
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a81b233bc36e..0f0f927037ef 100644
--- 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
index 9a49c394f04f..e679e708db63 100644
--- 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
index 93925f5908b8..0f98be4450b7 100644
--- 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");