|
@@ -5847,7 +5847,7 @@ static int ipr_queuecommand(struct Scsi_Host *shost,
|
|
|
struct ipr_ioarcb *ioarcb;
|
|
|
struct ipr_cmnd *ipr_cmd;
|
|
|
unsigned long lock_flags;
|
|
|
- int rc = 0;
|
|
|
+ int rc;
|
|
|
|
|
|
ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
|
|
|
|
|
@@ -5905,12 +5905,10 @@ static int ipr_queuecommand(struct Scsi_Host *shost,
|
|
|
(!ipr_is_gscsi(res) || scsi_cmd->cmnd[0] == IPR_QUERY_RSRC_STATE))
|
|
|
ioarcb->cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
|
|
|
|
|
|
- if (likely(rc == 0)) {
|
|
|
- if (ioa_cfg->sis64)
|
|
|
- rc = ipr_build_ioadl64(ioa_cfg, ipr_cmd);
|
|
|
- else
|
|
|
- rc = ipr_build_ioadl(ioa_cfg, ipr_cmd);
|
|
|
- }
|
|
|
+ if (ioa_cfg->sis64)
|
|
|
+ rc = ipr_build_ioadl64(ioa_cfg, ipr_cmd);
|
|
|
+ else
|
|
|
+ rc = ipr_build_ioadl(ioa_cfg, ipr_cmd);
|
|
|
|
|
|
spin_lock_irqsave(shost->host_lock, lock_flags);
|
|
|
if (unlikely(rc || (!ioa_cfg->allow_cmds && !ioa_cfg->ioa_is_dead))) {
|