2 files changed, 7 insertions, 2 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;
 }
 
 /*
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;