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

[net-next-2.6.git] / drivers / infiniband / core / sa_query.c

diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index a2c4234ca8a36a903ac85613965e6378b85aeead..0e5ef97f7637edc19df101b4afe21829f7f2f095 100644 (file)
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -993,6 +993,7 @@ static int __init ib_sa_init(void)
 static void __exit ib_sa_cleanup(void)
 {
        ib_unregister_client(&sa_client);
+       idr_destroy(&query_idr);
 }
 
 module_init(ib_sa_init);