Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24b79a95 authored by Anil Gurumurthy's avatar Anil Gurumurthy Committed by Greg Kroah-Hartman
Browse files

scsi: qla2xxx: Return error when TMF returns 



commit b4146c4929ef61d5afca011474d59d0918a0cd82 upstream.

Propagate the task management completion status properly to avoid
unnecessary waits for commands to complete.

Fixes: faef62d1 ("[SCSI] qla2xxx: Fix Task Management command asynchronous handling")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAnil Gurumurthy <anil.gurumurthy@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f71d13c3

drivers/scsi/qla2xxx/qla_init.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -329,11 +329,10 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun, 




	wait_for_completion(&tm_iocb->u.tmf.comp);

	wait_for_completion(&tm_iocb->u.tmf.comp);





	rval = tm_iocb->u.tmf.comp_status == CS_COMPLETE ?

	rval = tm_iocb->u.tmf.data;

	    QLA_SUCCESS : QLA_FUNCTION_FAILED;





	if ((rval != QLA_SUCCESS) || tm_iocb->u.tmf.data) {

	if (rval != QLA_SUCCESS) {

		ql_dbg(ql_dbg_taskm, vha, 0x8030,

		ql_log(ql_log_warn, vha, 0x8030,

		    "TM IOCB failed (%x).\n", rval);

		    "TM IOCB failed (%x).\n", rval);

	}

	}