diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-24 13:55:29 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-24 13:55:29 -0400 |
| commit | ec329a135974f1c400214dab02f09584d4beeba9 (patch) | |
| tree | 235be754f76f4e7d51975d2434f226cfc75cdd08 /drivers/infiniband/core/sa_query.c | |
| parent | bbf207860931b6a033d0fbcd170ae2332c0d8216 (diff) | |
| parent | 5d7edb3c1a01310725d86f0d83fb3be45685dc82 (diff) | |
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
Diffstat (limited to 'drivers/infiniband/core/sa_query.c')
| -rw-r--r-- | drivers/infiniband/core/sa_query.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c index a2c4234ca8a3..0e5ef97f7637 100644 --- 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) | |||
| 993 | static void __exit ib_sa_cleanup(void) | 993 | static void __exit ib_sa_cleanup(void) |
| 994 | { | 994 | { |
| 995 | ib_unregister_client(&sa_client); | 995 | ib_unregister_client(&sa_client); |
| 996 | idr_destroy(&query_idr); | ||
| 996 | } | 997 | } |
| 997 | 998 | ||
| 998 | module_init(ib_sa_init); | 999 | module_init(ib_sa_init); |