[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>

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index dd69ad46f5789af66c6fbb8a1fd68140eb766ac4..1906c009ba583d2cc69b205a78f5e97a5c202164 100644 (file)
--- 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);