pcmcia/sa1100_h3600: replace schedule_timeout() with msleep()

PATCH New [email protected] 1 participant 1 message Sep 23, 2004 Pcmcia

lore

Share & tools

lore

[email protected]

author

2004-09-23 20:24 UTC #0 lore raw

PATCH 5/5 pcmcia/sa1100_h3600: replace schedule_timeout() with msleep()

I would appreciate any comments from the janitor@sternweltens list.

Description: Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time.

Signed-off-by Nishanth Aravamudan <[email protected]>

Signed-off-by Maximilian Attems <[email protected]>

---

 linux-2.6.9-rc2-bk7-max/drivers/pcmcia/sa1100_h3600.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/pcmcia/sa1100_h3600.c renamed from drivers/pcmcia/sa1100_h3600.c~msleep-drivers_pcmcia_sa1100_h3600 +2 -2

diff -puN drivers/pcmcia/sa1100_h3600.c~msleep-drivers_pcmcia_sa1100_h3600 drivers/pcmcia/sa1100_h3600.c
@@ -10,6 +10,7 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 
 #include <asm/hardware.h>
 #include <asm/irq.h>

@@ -96,8 +97,7 @@ static void h3600_pcmcia_socket_init(str
 	set_h3600_egpio(IPAQ_EGPIO_OPT_ON);
 	clr_h3600_egpio(IPAQ_EGPIO_OPT_RESET);
 
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(10*HZ / 1000);
+	msleep(10);
 
 	soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
 }