scsi: qla2xxx: Fix sending ADISC command for login

This patch fixes login_retry login for ADISC command.

when login_retry count reaches 0, further attempt to send ADISC command
is ignored by the code. Remove this redundant login_retry count check
from qla24xx_fcport_handle_login()

[mkp: fix typo]

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 8f55dd44adaef43386399fc767b7de94b7ef2465..b9050cb52c0eca8d40be22cfcd68df6c67d15b31 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1167,9 +1167,6 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
            fcport->login_gen, fcport->login_retry,
            fcport->loop_id, fcport->scan_state);
 
-       if (fcport->login_retry == 0)
-               return 0;
-
        if (fcport->scan_state != QLA_FCPORT_FOUND)
                return 0;
 
@@ -1194,7 +1191,8 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)
                return 0;
        }
 
-       fcport->login_retry--;
+       if (fcport->login_retry > 0)
+               fcport->login_retry--;
 
        switch (fcport->disc_state) {
        case DSC_DELETED: