]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
IB/cm: Destroy idr as part of the module init error flow
authorDotan Barak <dotanb@dev.mellanox.co.il>
Wed, 11 Jul 2012 15:39:31 +0000 (15:39 +0000)
committerRoland Dreier <roland@purestorage.com>
Wed, 11 Jul 2012 16:22:58 +0000 (09:22 -0700)
Clean the idr as part of the error flow since it is a resource too.

Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
Reviewed-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
drivers/infiniband/core/cm.c

index c889aaef34168f2f7229e8e1ca8e3bd752ad3541..d67999f6e34a147a6f99cdcd162fba4ebfdbb82d 100644 (file)
@@ -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;
 }