summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-02-17 11:02:22 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2010-02-17 18:05:54 +0100
commitd801c1409ef7d45339cbe8ac9de28ade6ed4699a (patch)
treeb43b05716947bf8fa87689ae4f3ae6908552eedd /drivers/pcmcia
parentd700518a0e4d17a47321414e5e487ed53f4ae752 (diff)
downloadop-kernel-dev-d801c1409ef7d45339cbe8ac9de28ade6ed4699a.zip
op-kernel-dev-d801c1409ef7d45339cbe8ac9de28ade6ed4699a.tar.gz
pcmcia: remove useless msleep in ds.c
As this is the socket thread (pccardd) starting up, we do not have anything to wait for in ds.c. Instead, wait the same amount of time in pccardd to allow userspace to catch up and - possibly - execute pcmcia-socket-startup. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/cs.c3
-rw-r--r--drivers/pcmcia/ds.c6
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 9a49c39..e679e70 100644
--- a/drivers/pcmcia/cs.c
+++ b/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/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 93925f5..0f98be4 100644
--- a/drivers/pcmcia/ds.c
+++ b/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");
OpenPOWER on IntegriCloud