aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorMichael Cyr <mikecyr@us.ibm.com>2017-03-16 20:48:20 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-22 07:43:35 -0400
commit0ad1d7660a57152ab6c7ae8ff5d02b6460b281a8 (patch)
tree333f8add5669c26e5ead84cb6b9f4d5f13e29ccc /drivers/scsi
parent61229e62c1aa4d397aab9949325cab49acfd7dab (diff)
scsi: ibmvscsis: Issues from Dan Carpenter/Smatch
[ Upstream commit 11950d70b52d2bc5e3580da8cd63909ef38d67db ] Signed-off-by: Michael Cyr <mikecyr@us.ibm.com> Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com> Tested-by: Steven Royer <seroyer@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
index 91dfd58b175d..292a3f3837c7 100644
--- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
+++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
@@ -1746,14 +1746,7 @@ static long ibmvscsis_mad(struct scsi_info *vscsi, struct viosrp_crq *crq)
1746 1746
1747 pr_debug("mad: type %d\n", be32_to_cpu(mad->type)); 1747 pr_debug("mad: type %d\n", be32_to_cpu(mad->type));
1748 1748
1749 if (be16_to_cpu(mad->length) < 0) { 1749 rc = ibmvscsis_process_mad(vscsi, iue);
1750 dev_err(&vscsi->dev, "mad: length is < 0\n");
1751 ibmvscsis_post_disconnect(vscsi,
1752 ERR_DISCONNECT_RECONNECT, 0);
1753 rc = SRP_VIOLATION;
1754 } else {
1755 rc = ibmvscsis_process_mad(vscsi, iue);
1756 }
1757 1750
1758 pr_debug("mad: status %hd, rc %ld\n", be16_to_cpu(mad->status), 1751 pr_debug("mad: status %hd, rc %ld\n", be16_to_cpu(mad->status),
1759 rc); 1752 rc);
@@ -2523,7 +2516,6 @@ static void ibmvscsis_parse_cmd(struct scsi_info *vscsi,
2523 dev_err(&vscsi->dev, "0x%llx: parsing SRP descriptor table failed.\n", 2516 dev_err(&vscsi->dev, "0x%llx: parsing SRP descriptor table failed.\n",
2524 srp->tag); 2517 srp->tag);
2525 goto fail; 2518 goto fail;
2526 return;
2527 } 2519 }
2528 2520
2529 cmd->rsp.sol_not = srp->sol_not; 2521 cmd->rsp.sol_not = srp->sol_not;
@@ -3379,7 +3371,8 @@ static int ibmvscsis_probe(struct vio_dev *vdev,
3379 INIT_LIST_HEAD(&vscsi->waiting_rsp); 3371 INIT_LIST_HEAD(&vscsi->waiting_rsp);
3380 INIT_LIST_HEAD(&vscsi->active_q); 3372 INIT_LIST_HEAD(&vscsi->active_q);
3381 3373
3382 snprintf(vscsi->tport.tport_name, 256, "%s", dev_name(&vdev->dev)); 3374 snprintf(vscsi->tport.tport_name, IBMVSCSIS_NAMELEN, "%s",
3375 dev_name(&vdev->dev));
3383 3376
3384 pr_debug("probe tport_name: %s\n", vscsi->tport.tport_name); 3377 pr_debug("probe tport_name: %s\n", vscsi->tport.tport_name);
3385 3378