diff options
author | Mike Marciniszyn <mike.marciniszyn@intel.com> | 2013-03-28 18:17:20 +0000 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2013-04-16 23:04:36 -0700 |
commit | c9bdad3c819cf63e2acea9994d2a60f23f1b7dd5 (patch) | |
tree | fa33fd93b1aa47ed904f52e0c13f36e058a19846 /drivers/infiniband/hw/qib/qib_sysfs.c | |
parent | IB/ipath: Correct ipath_verbs_register_sysfs() error handling (diff) | |
download | linux-dev-c9bdad3c819cf63e2acea9994d2a60f23f1b7dd5.tar.xz linux-dev-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_sysfs.c')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_sysfs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_sysfs.c b/drivers/infiniband/hw/qib/qib_sysfs.c index 034cc821de5c..3c8e4e3caca6 100644 --- a/drivers/infiniband/hw/qib/qib_sysfs.c +++ b/drivers/infiniband/hw/qib/qib_sysfs.c @@ -808,10 +808,14 @@ int qib_verbs_register_sysfs(struct qib_devdata *dd) for (i = 0; i < ARRAY_SIZE(qib_attributes); ++i) { ret = device_create_file(&dev->dev, qib_attributes[i]); if (ret) - return ret; + goto bail; } return 0; +bail: + for (i = 0; i < ARRAY_SIZE(qib_attributes); ++i) + device_remove_file(&dev->dev, qib_attributes[i]); + return ret; } /* |