diff options
-rw-r--r-- | drivers/block/cciss.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 24c3e21ab263..b890f8b3c092 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <linux/proc_fs.h> | 36 | #include <linux/proc_fs.h> |
37 | #include <linux/seq_file.h> | 37 | #include <linux/seq_file.h> |
38 | #include <linux/init.h> | 38 | #include <linux/init.h> |
39 | #include <linux/jiffies.h> | ||
39 | #include <linux/hdreg.h> | 40 | #include <linux/hdreg.h> |
40 | #include <linux/spinlock.h> | 41 | #include <linux/spinlock.h> |
41 | #include <linux/compat.h> | 42 | #include <linux/compat.h> |
@@ -3489,7 +3490,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) | |||
3489 | if (scratchpad == CCISS_FIRMWARE_READY) | 3490 | if (scratchpad == CCISS_FIRMWARE_READY) |
3490 | break; | 3491 | break; |
3491 | set_current_state(TASK_INTERRUPTIBLE); | 3492 | set_current_state(TASK_INTERRUPTIBLE); |
3492 | schedule_timeout(HZ / 10); /* wait 100ms */ | 3493 | schedule_timeout(msecs_to_jiffies(100)); /* wait 100ms */ |
3493 | } | 3494 | } |
3494 | if (scratchpad != CCISS_FIRMWARE_READY) { | 3495 | if (scratchpad != CCISS_FIRMWARE_READY) { |
3495 | printk(KERN_WARNING "cciss: Board not ready. Timed out.\n"); | 3496 | printk(KERN_WARNING "cciss: Board not ready. Timed out.\n"); |
@@ -3615,7 +3616,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) | |||
3615 | break; | 3616 | break; |
3616 | /* delay and try again */ | 3617 | /* delay and try again */ |
3617 | set_current_state(TASK_INTERRUPTIBLE); | 3618 | set_current_state(TASK_INTERRUPTIBLE); |
3618 | schedule_timeout(10); | 3619 | schedule_timeout(msecs_to_jiffies(1)); |
3619 | } | 3620 | } |
3620 | 3621 | ||
3621 | #ifdef CCISS_DEBUG | 3622 | #ifdef CCISS_DEBUG |