From: Nishanth Aravamudan Subject: [Kernel-janitors] [PATCH 2.6.9-rc2 2/3] parport/ieee1284_ops: replace schedule_timeout() with msleep_interruptible() Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer --- ieee1284_ops.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) Index: quilt/drivers/parport/ieee1284_ops.c =================================================================== --- quilt.orig/drivers/parport/ieee1284_ops.c +++ quilt/drivers/parport/ieee1284_ops.c @@ -97,8 +97,7 @@ size_t parport_ieee1284_write_compat (st our interrupt handler called. */ if (count && no_irq) { parport_release (dev); - __set_current_state (TASK_INTERRUPTIBLE); - schedule_timeout (wait); + msleep_interruptible(jiffies_to_msecs(wait)); parport_claim_or_block (dev); } else @@ -542,8 +541,7 @@ size_t parport_ieee1284_ecp_read_data (s /* Yield the port for a while. */ if (count && dev->port->irq != PARPORT_IRQ_NONE) { parport_release (dev); - __set_current_state (TASK_INTERRUPTIBLE); - schedule_timeout ((HZ + 24) / 25); + msleep_interruptible(40); parport_claim_or_block (dev); } else