2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 3b557231e1d3..b9f8658341cc 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4353,7 +4353,7 @@ static __devinit int cciss_message(struct pci_dev *pdev, unsigned char opcode, u
                 tag = readl(vaddr + SA5_REPLY_PORT_OFFSET);
                 if ((tag & ~3) == paddr32)
                         break;
-                schedule_timeout_uninterruptible(HZ);
+                msleep(CCISS_POST_RESET_NOOP_TIMEOUT_MSECS);
         }
 
         iounmap(vaddr);
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 21ec628ef700..16b4d58d84dd 100644
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -209,8 +209,9 @@ struct ctlr_info
         ((CCISS_BOARD_NOT_READY_WAIT_SECS * 1000) / \
                 CCISS_BOARD_READY_POLL_INTERVAL_MSECS)
 #define CCISS_POST_RESET_PAUSE_MSECS (3000)
-#define CCISS_POST_RESET_NOOP_INTERVAL_MSECS (1000)
+#define CCISS_POST_RESET_NOOP_INTERVAL_MSECS (4000)
 #define CCISS_POST_RESET_NOOP_RETRIES (12)
+#define CCISS_POST_RESET_NOOP_TIMEOUT_MSECS (10000)
 
 /* 
         Send the command to the hardware