diff options
| author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2006-06-23 16:11:17 -0700 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-26 16:25:00 -0500 |
| commit | 7d7abc77cc469ff41dde8eea606e1dab88d4ba86 (patch) | |
| tree | d1839ee53f595b8d44e0ad953129ddf5bc092c0f /drivers/scsi/qla2xxx | |
| parent | 0181944fe647cae18d545ac1167df3d15d393701 (diff) | |
| download | blackbird-op-linux-7d7abc77cc469ff41dde8eea606e1dab88d4ba86.tar.gz blackbird-op-linux-7d7abc77cc469ff41dde8eea606e1dab88d4ba86.zip | |
[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>
Diffstat (limited to 'drivers/scsi/qla2xxx')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 761dd1f7e3f1..c7ab66877fb7 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1273,8 +1273,7 @@ qla2x00_fw_ready(scsi_qla_host_t *ha) rval = QLA_FUNCTION_FAILED; 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 * other than Wait for Login. */ |
