From 06be32546e2fb6f01be0ac39b9e2921e063a3924 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl>
Date: Tue, 25 May 2004 18:29:57 -0700
Subject: [PATCH] [PATCH] ide: fix ide_delay_50ms() in ide.c to always sleep

Noticed by Christoph Hellwig <hch@lst.de>.

Probably somebody got the logic wrong while adding
#ifndef CONFIG_BLK_DEV_IDECS back in 2.4.0-test2.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
 drivers/ide/ide.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index dd69ad46f5789..1906c009ba583 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1397,12 +1397,8 @@ void ide_add_generic_settings (ide_drive_t *drive)
  */
 void ide_delay_50ms (void)
 {
-#ifndef CONFIG_BLK_DEV_IDECS
-	mdelay(50);
-#else
 	__set_current_state(TASK_UNINTERRUPTIBLE);
 	schedule_timeout(1+HZ/20);
-#endif /* CONFIG_BLK_DEV_IDECS */
 }
 
 EXPORT_SYMBOL(ide_delay_50ms);
-- 
2.53.0