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

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

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 6f747debca90e4e7538c0340ec9e8bdb1eaf08f1..3fe6f4754fa8fe81adda9ab85b477ed0bb071816 100644 (file)
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3338,6 +3338,7 @@ static void __exit ib_cm_cleanup(void)
        flush_workqueue(cm.wq);
        destroy_workqueue(cm.wq);
        ib_unregister_client(&cm_client);
+       idr_destroy(&cm.local_id_table);
 }
 
 module_init(ib_cm_init);