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

Commit 59e736ba authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Greg Kroah-Hartman
Browse files

scsi: qla2xxx: fixup incorrect usage of host_byte 

[ Upstream commit 66cf50e65b183c863825f5c28a818e3f47a72e40 ]

DRIVER_ERROR is a a driver byte setting, not a host byte.  The qla2xxx
driver should rather return DID_ERROR here to be in line with the other
drivers.

Link: https://lore.kernel.org/r/20191018140458.108278-1-hare@suse.de


Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5af2eb2f

drivers/scsi/qla2xxx/qla_bsg.c

+3 −3
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job) 
	srb_t *sp;

	const char *type;

	int req_sg_cnt, rsp_sg_cnt;

	int rval =  (DRIVER_ERROR << 16);

	int rval =  (DID_ERROR << 16);

	uint16_t nextlid = 0;



	if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) {
@@ -426,7 +426,7 @@ qla2x00_process_ct(struct fc_bsg_job *bsg_job) 
	struct Scsi_Host *host = bsg_job->shost;

	scsi_qla_host_t *vha = shost_priv(host);

	struct qla_hw_data *ha = vha->hw;

	int rval = (DRIVER_ERROR << 16);

	int rval = (DID_ERROR << 16);

	int req_sg_cnt, rsp_sg_cnt;

	uint16_t loop_id;

	struct fc_port *fcport;
@@ -1911,7 +1911,7 @@ qlafx00_mgmt_cmd(struct fc_bsg_job *bsg_job) 
	struct Scsi_Host *host = bsg_job->shost;

	scsi_qla_host_t *vha = shost_priv(host);

	struct qla_hw_data *ha = vha->hw;

	int rval = (DRIVER_ERROR << 16);

	int rval = (DID_ERROR << 16);

	struct qla_mt_iocb_rqst_fx00 *piocb_rqst;

	srb_t *sp;

	int req_sg_cnt = 0, rsp_sg_cnt = 0;