From: Nishanth Aravamudan Subject: [KJ] [PATCH 9/14] block/cciss: use msleep() instead of schedule_timeout() From: Nishanth Aravamudan Use msleep() instead of schedule_timeout() to guarantee the task delays as expected. This change was ACK'ed before, but there were multiple versions floating around and this hunk got lost, it seems. Signed-off-by: Nishanth Aravamudan --- cciss.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) Index: quilt/drivers/block/cciss.c =================================================================== --- quilt.orig/drivers/block/cciss.c +++ quilt/drivers/block/cciss.c @@ -2442,8 +2442,7 @@ static int cciss_pci_init(ctlr_info_t *c scratchpad = readl(c->vaddr + SA5_SCRATCHPAD_OFFSET); if (scratchpad == CCISS_FIRMWARE_READY) break; - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(HZ / 10); /* wait 100ms */ + msleep(100); } if (scratchpad != CCISS_FIRMWARE_READY) { printk(KERN_WARNING "cciss: Board not ready. Timed out.\n");