Skip to content

Commit

Permalink
qla2xxx: Fix wrong argument in sp done callback
Browse files Browse the repository at this point in the history 
Callback for sp->done expects scsi_qla_host is passed in as argument,
Instead qla_hw_data is passed in.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
  • Loading branch information
Quinn Tran authored and Nicholas Bellinger committed Feb 9, 2017
1 parent 2c39b5c commit 5e4deaf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions drivers/scsi/qla2xxx/qla_isr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@ qla2x00_process_completed_request(struct scsi_qla_host *vha,
req->outstanding_cmds[index] = NULL;

/* Save ISP completion status */
sp->done(ha, sp, DID_OK << 16);
sp->done(vha, sp, DID_OK << 16);
} else {
ql_log(ql_log_warn, vha, 0x3016, "Invalid SCSI SRB.\n");

Expand Down Expand Up @@ -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);

if (rsp->status_srb == NULL)
sp->done(ha, sp, res);
sp->done(vha, sp, res);
}

/**
Expand Down Expand Up @@ -2462,7 +2462,7 @@ qla2x00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt)
/* Place command on done queue. */
if (sense_len == 0) {
rsp->status_srb = NULL;
sp->done(ha, sp, cp->result);
sp->done(vha, sp, cp->result);
}
}

Expand Down Expand Up @@ -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);
if (sp) {
sp->done(ha, sp, res);
sp->done(vha, sp, res);
return;
}
fatal:
Expand Down
6 changes: 3 additions & 3 deletions drivers/scsi/qla2xxx/qla_mr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2537,7 +2537,7 @@ qlafx00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
par_sense_len, rsp_info_len);

if (rsp->status_srb == NULL)
sp->done(ha, sp, res);
sp->done(vha, sp, res);
}

/**
Expand Down Expand Up @@ -2614,7 +2614,7 @@ qlafx00_status_cont_entry(struct rsp_que *rsp, sts_cont_entry_t *pkt)
/* Place command on done queue. */
if (sense_len == 0) {
rsp->status_srb = NULL;
sp->done(ha, sp, cp->result);
sp->done(vha, sp, cp->result);
}
}

Expand Down Expand Up @@ -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);
if (sp) {
sp->done(ha, sp, res);
sp->done(vha, sp, res);
return;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/qla2xxx/qla_os.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
}

spin_lock_irqsave(&ha->hardware_lock, flags);
sp->done(ha, sp, 0);
sp->done(vha, sp, 0);
spin_unlock_irqrestore(&ha->hardware_lock, flags);

/* Did the command return during mailbox execution? */
Expand Down

0 comments on commit 5e4deaf

Please sign in to comment.