Commit 06be3254 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[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: default avatarBartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e59eed78
...@@ -1397,12 +1397,8 @@ void ide_add_generic_settings (ide_drive_t *drive) ...@@ -1397,12 +1397,8 @@ void ide_add_generic_settings (ide_drive_t *drive)
*/ */
void ide_delay_50ms (void) void ide_delay_50ms (void)
{ {
#ifndef CONFIG_BLK_DEV_IDECS
mdelay(50);
#else
__set_current_state(TASK_UNINTERRUPTIBLE); __set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(1+HZ/20); schedule_timeout(1+HZ/20);
#endif /* CONFIG_BLK_DEV_IDECS */
} }
EXPORT_SYMBOL(ide_delay_50ms); EXPORT_SYMBOL(ide_delay_50ms);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment