Commit 5e4deaf6 authored by Quinn Tran's avatar Quinn Tran Committed by Nicholas Bellinger

qla2xxx: Fix wrong argument in sp done callback

Callback for sp->done expects scsi_qla_host is passed in as argument,
Instead qla_hw_data is passed in.
Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 2c39b5ca
...@@ -1212,7 +1212,7 @@ qla2x00_process_completed_request(struct scsi_qla_host *vha, ...@@ -1212,7 +1212,7 @@ qla2x00_process_completed_request(struct scsi_qla_host *vha,
req->outstanding_cmds[index] = NULL; req->outstanding_cmds[index] = NULL;
/* Save ISP completion status */ /* Save ISP completion status */
sp->done(ha, sp, DID_OK << 16); sp->done(vha, sp, DID_OK << 16);
} else { } else {
ql_log(ql_log_warn, vha, 0x3016, "Invalid SCSI SRB.\n"); ql_log(ql_log_warn, vha, 0x3016, "Invalid SCSI SRB.\n");
...@@ -2405,7 +2405,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) ...@@ -2405,7 +2405,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
resid_len, fw_resid_len, sp, cp); resid_len, fw_resid_len, sp, cp);
if (rsp->status_srb == NULL) if (rsp->status_srb == NULL)
sp->done(ha, sp, res); sp->done(vha, sp, res);
} }
/** /**
...@@ -2462,7 +2462,7 @@ qla2x00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt) ...@@ -2462,7 +2462,7 @@ qla2x00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt)
/* Place command on done queue. */ /* Place command on done queue. */
if (sense_len == 0) { if (sense_len == 0) {
rsp->status_srb = NULL; rsp->status_srb = NULL;
sp->done(ha, sp, cp->result); sp->done(vha, sp, cp->result);
} }
} }
...@@ -2498,7 +2498,7 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt) ...@@ -2498,7 +2498,7 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt)
sp = qla2x00_get_sp_from_handle(vha, func, req, pkt); sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
if (sp) { if (sp) {
sp->done(ha, sp, res); sp->done(vha, sp, res);
return; return;
} }
fatal: fatal:
......
...@@ -2537,7 +2537,7 @@ qlafx00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) ...@@ -2537,7 +2537,7 @@ qlafx00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
par_sense_len, rsp_info_len); par_sense_len, rsp_info_len);
if (rsp->status_srb == NULL) if (rsp->status_srb == NULL)
sp->done(ha, sp, res); sp->done(vha, sp, res);
} }
/** /**
...@@ -2614,7 +2614,7 @@ qlafx00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt) ...@@ -2614,7 +2614,7 @@ qlafx00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt)
/* Place command on done queue. */ /* Place command on done queue. */
if (sense_len == 0) { if (sense_len == 0) {
rsp->status_srb = NULL; rsp->status_srb = NULL;
sp->done(ha, sp, cp->result); sp->done(vha, sp, cp->result);
} }
} }
...@@ -2695,7 +2695,7 @@ qlafx00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, ...@@ -2695,7 +2695,7 @@ qlafx00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp,
sp = qla2x00_get_sp_from_handle(vha, func, req, pkt); sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
if (sp) { if (sp) {
sp->done(ha, sp, res); sp->done(vha, sp, res);
return; return;
} }
......
...@@ -1203,7 +1203,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) ...@@ -1203,7 +1203,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
} }
spin_lock_irqsave(&ha->hardware_lock, flags); spin_lock_irqsave(&ha->hardware_lock, flags);
sp->done(ha, sp, 0); sp->done(vha, sp, 0);
spin_unlock_irqrestore(&ha->hardware_lock, flags); spin_unlock_irqrestore(&ha->hardware_lock, flags);
/* Did the command return during mailbox execution? */ /* Did the command return during mailbox execution? */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment