summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Marciniszyn <mike.marciniszyn@intel.com>2012-09-12 13:01:29 +0000
committerRoland Dreier <roland@purestorage.com>2012-09-14 10:42:32 -0700
commit4c3550057b83bde3250b2f105c7f56326fb43044 (patch)
treef2b6336daf162a7e2771fddf45dfcca55a6ac4b7
parentfea7a08acb13524b47711625eebea40a0ede69a0 (diff)
downloadop-kernel-dev-4c3550057b83bde3250b2f105c7f56326fb43044.zip
op-kernel-dev-4c3550057b83bde3250b2f105c7f56326fb43044.tar.gz
IB/qib: Fix failure of compliance test C14-024#06_LocalPortNum
Commit 3236b2d469db ("IB/qib: MADs with misset M_Keys should return failure") introduced a return code assignment that unfortunately introduced an unconditional exit for the routine due to missing braces. This patch adds the braces to correct the original patch. Reviewed-by: Dean Luick <dean.luick@intel.com> Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
-rw-r--r--drivers/infiniband/hw/qib/qib_mad.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_mad.c b/drivers/infiniband/hw/qib/qib_mad.c
index 19f1e6c..ccb1191 100644
--- a/drivers/infiniband/hw/qib/qib_mad.c
+++ b/drivers/infiniband/hw/qib/qib_mad.c
@@ -471,9 +471,10 @@ static int subn_get_portinfo(struct ib_smp *smp, struct ib_device *ibdev,
if (port_num != port) {
ibp = to_iport(ibdev, port_num);
ret = check_mkey(ibp, smp, 0);
- if (ret)
+ if (ret) {
ret = IB_MAD_RESULT_FAILURE;
goto bail;
+ }
}
}
OpenPOWER on IntegriCloud