X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fpcmcia%2Fds.c;h=b4f741a12cce07ee72c092a3026832783f482dc2;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=71592c71d53b05a3614e4ea32a1851cb4cc7e7b0;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 71592c71d..b4f741a12 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -133,7 +134,7 @@ static dev_info_t dev_info = "Driver Services"; static int major_dev = -1; -extern struct proc_dir_entry *proc_pccard; +static struct proc_dir_entry *proc_pccard; /*====================================================================*/ @@ -1080,8 +1081,7 @@ static int __devinit pcmcia_bus_add_socket(struct class_device *class_dev) * 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.. */ - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(HZ/4); + msleep(250); init_waitqueue_head(&s->queue); init_waitqueue_head(&s->request);