瀏覽代碼

[SCSI] qla2xxx: Correct 'loop-down' determination logic in qla2x00_fw_ready().

As there is no point in failing the initialization process when
firmware informs the host software that it could not transition
beyond a CONFIG_WAIT nor WAIT_FOR_LOGIN state.  Previous logic
would mark such conditions as a general *failure* and subsequently
tear-down the scsi-host during initialization.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Andrew Vasquez 19 年之前
父節點
當前提交
7d7abc77cc
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      drivers/scsi/qla2xxx/qla_init.c

+ 1 - 2
drivers/scsi/qla2xxx/qla_init.c

@@ -1273,8 +1273,7 @@ qla2x00_fw_ready(scsi_qla_host_t *ha)
 			rval = QLA_FUNCTION_FAILED;
 			rval = QLA_FUNCTION_FAILED;
 
 
 			if (atomic_read(&ha->loop_down_timer) &&
 			if (atomic_read(&ha->loop_down_timer) &&
-			    (fw_state >= FSTATE_LOSS_OF_SYNC ||
-				fw_state == FSTATE_WAIT_AL_PA)) {
+			    fw_state != FSTATE_READY) {
 				/* Loop down. Timeout on min_wait for states
 				/* Loop down. Timeout on min_wait for states
 				 * other than Wait for Login.
 				 * other than Wait for Login.
 				 */
 				 */