scsi: qla2xxx: Fix iIDMA error

[ Upstream commit 8d9bf0a9a268f7ca0b811d6e6a1fc783afa5c746 ]

When switch responds with error for Get Port Speed Command (GPSC), driver
should not proceed with telling FW about the speed of the remote port.

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 2a19ec0660cbbb031c28b9b382cb4563466ea6ef..1088038e6a418e6f1e5f7187d0d5574f97ed10ac 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3033,7 +3033,7 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)
                        ql_dbg(ql_dbg_disc, vha, 0x2019,
                            "GPSC command unsupported, disabling query.\n");
                        ha->flags.gpsc_supported = 0;
-                       res = QLA_SUCCESS;
+                       goto done;
                }
        } else {
                switch (be16_to_cpu(ct_rsp->rsp.gpsc.speed)) {
@@ -3066,13 +3066,13 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res)
                    be16_to_cpu(ct_rsp->rsp.gpsc.speeds),
                    be16_to_cpu(ct_rsp->rsp.gpsc.speed));
        }
-done:
        memset(&ea, 0, sizeof(ea));
        ea.event = FCME_GPSC_DONE;
        ea.rc = res;
        ea.fcport = fcport;
        qla2x00_fcport_event_handler(vha, &ea);
 
+done:
        sp->free(sp);
 }