Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / scsi / megaraid / megaraid_sas_base.c

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index dace907744a5dc02edca5751441f97ff37432b12..293f5cf524d7a3918f7151661dc6fae0af8da26e 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -3924,12 +3924,12 @@ megasas_transition_to_ready(struct megasas_instance *instance, int ocr)
                /*
                 * The cur_state should not last for more than max_wait secs
                 */
-               for (i = 0; i < max_wait; i++) {
+               for (i = 0; i < max_wait * 50; i++) {
                        curr_abs_state = instance->instancet->
                                read_fw_status_reg(instance);
 
                        if (abs_state == curr_abs_state) {
-                               msleep(1000);
+                               msleep(20);
                        } else
                                break;
                }