summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/qib/qib_verbs.c
diff options
context:
space:
mode:
authorMike Marciniszyn2013-03-28 19:17:20 +0100
committerRoland Dreier2013-04-17 08:04:36 +0200
commitc9bdad3c819cf63e2acea9994d2a60f23f1b7dd5 (patch)
treefa33fd93b1aa47ed904f52e0c13f36e058a19846 /drivers/infiniband/hw/qib/qib_verbs.c
parentIB/ipath: Correct ipath_verbs_register_sysfs() error handling (diff)
downloadkernel-qcow2-linux-c9bdad3c819cf63e2acea9994d2a60f23f1b7dd5.tar.gz
kernel-qcow2-linux-c9bdad3c819cf63e2acea9994d2a60f23f1b7dd5.tar.xz
kernel-qcow2-linux-c9bdad3c819cf63e2acea9994d2a60f23f1b7dd5.zip
IB/qib: Correct qib_verbs_register_sysfs() error handling
qib_verbs_register_sysfs() never cleans up from a failure. Additionally, the caller of qib_verbs_register_sysfs() doesn't return the correct "ret" value. This patch resolves both of those issues. Reported-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> 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>
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_verbs.c')
-rw-r--r--drivers/infiniband/hw/qib/qib_verbs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index 7c0ab16a2fe2..904c384aa361 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -2234,7 +2234,8 @@ int qib_register_ib_device(struct qib_devdata *dd)
if (ret)
goto err_agents;
- if (qib_verbs_register_sysfs(dd))
+ ret = qib_verbs_register_sysfs(dd);
+ if (ret)
goto err_class;
goto bail;