[PATCH] make Linux IDE more CELF-conforming ;)

[Bartlomiej Zolnierkiewicz]

I want to push it to Linus soon...

Noticed by Christoph Hellwig <hch@xxxxxx>.

Fix ide_delay_50ms() in ide.c to always sleep.

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

 linux-2.6.6-bk3-bzolnier/drivers/ide/ide.c |    4 ----
 1 files changed, 4 deletions(-)

diff -puN drivers/ide/ide.c~ide_delay_50ms drivers/ide/ide.c
--- linux-2.6.6-bk3/drivers/ide/ide.c~ide_delay_50ms	2004-05-20 00:42:24.017922320 +0200
+++ linux-2.6.6-bk3-bzolnier/drivers/ide/ide.c	2004-05-20 00:42:38.945652960 +0200
@@ -1396,12 +1396,8 @@ void ide_add_generic_settings (ide_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);

_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/