patch-2.4.3 linux/drivers/ide/ide.c
Next file: linux/drivers/ide/pdc4030.c
Previous file: linux/drivers/ide/ide-probe.c
Back to the patch index
Back to the overall index
- Lines: 19
- Date:
Tue Mar 6 19:44:34 2001
- Orig file:
v2.4.2/linux/drivers/ide/ide.c
- Orig date:
Wed Feb 21 18:20:22 2001
diff -u --recursive --new-file v2.4.2/linux/drivers/ide/ide.c linux/drivers/ide/ide.c
@@ -1400,7 +1400,7 @@
if ((handler = hwgroup->handler) == NULL) {
/*
- * Either a marginal timeout occured
+ * Either a marginal timeout occurred
* (got the interrupt just as timer expired),
* or we were "sleeping" to give other devices a chance.
* Either way, we don't really want to complain about anything.
@@ -2467,8 +2467,7 @@
void ide_delay_50ms (void)
{
#ifndef CONFIG_BLK_DEV_IDECS
- unsigned long timeout = jiffies + ((HZ + 19)/20) + 1;
- while (0 < (signed long)(timeout - jiffies));
+ mdelay(50);
#else
__set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(HZ/20);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)