summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@us.ibm.com>2005-09-10 00:27:15 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 10:06:34 -0700
commit2aad5f03d97bbaf1b19f31347656de953247c7da (patch)
tree7395663b18252a1b2b3d3d1bdf3137bfe0843bd8 /drivers/ide
parentf6a2f3404a3b09281a264058fa8dd318bac51178 (diff)
downloadlinux-stable-2aad5f03d97bbaf1b19f31347656de953247c7da.tar.gz
linux-stable-2aad5f03d97bbaf1b19f31347656de953247c7da.tar.bz2
linux-stable-2aad5f03d97bbaf1b19f31347656de953247c7da.zip
[PATCH] janitor: ide/ide-cs: replace schedule_timeout() with msleep()
Uses msleep() in place of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/legacy/ide-cs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index dc0841b2721c..0ccf85fcee34 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -43,6 +43,7 @@
#include <linux/ide.h>
#include <linux/hdreg.h>
#include <linux/major.h>
+#include <linux/delay.h>
#include <asm/io.h>
#include <asm/system.h>
@@ -340,8 +341,7 @@ static void ide_config(dev_link_t *link)
break;
}
}
- __set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep(100);
}
if (hd < 0) {