From: Dotan Barak <dot...@dev.mellanox.co.il>

Clean the idr as part of the error flow since it is a resource too.

Signed-off-by: Dotan Barak <dot...@dev.mellanox.co.il>
Reviewed-by: Sean Hefty <sean.he...@intel.com>
Signed-off-by: Or Gerlitz <ogerl...@mellanox.com>
---
 drivers/infiniband/core/cm.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index c889aae..d67999f 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3848,24 +3848,28 @@ static int __init ib_cm_init(void)
        INIT_LIST_HEAD(&cm.timewait_list);
 
        ret = class_register(&cm_class);
-       if (ret)
-               return -ENOMEM;
+       if (ret) {
+               ret = -ENOMEM;
+               goto error1;
+       }
 
        cm.wq = create_workqueue("ib_cm");
        if (!cm.wq) {
                ret = -ENOMEM;
-               goto error1;
+               goto error2;
        }
 
        ret = ib_register_client(&cm_client);
        if (ret)
-               goto error2;
+               goto error3;
 
        return 0;
-error2:
+error3:
        destroy_workqueue(cm.wq);
-error1:
+error2:
        class_unregister(&cm_class);
+error1:
+       idr_destroy(&cm.local_id_table);
        return ret;
 }
 
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to