Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)

[linux-2.6-omap-h63xx.git] / drivers / infiniband / core / ucm.c

diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index 02ca642089bdac7c760f532626cbadd3e25f5963..28477565ecba8df54012a0562cee7a0eec78b6ef 100644 (file)
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -1450,6 +1450,7 @@ static void __exit ib_ucm_cleanup(void)
        ib_unregister_client(&ucm_client);
        class_unregister(&ucm_class);
        unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);
+       idr_destroy(&ctx_id_table);
 }
 
 module_init(ib_ucm_init);