diff options
author | Roland Dreier <rolandd@cisco.com> | 2005-10-24 19:55:29 +0200 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2005-10-24 19:55:29 +0200 |
commit | ec329a135974f1c400214dab02f09584d4beeba9 (patch) | |
tree | 235be754f76f4e7d51975d2434f226cfc75cdd08 /drivers/infiniband/core/ucm.c | |
parent | [IB] user_mad: Use class_device.devt (diff) | |
parent | [IB] Add idr_destroy() calls on module unload (diff) | |
download | linux-ec329a135974f1c400214dab02f09584d4beeba9.tar.xz linux-ec329a135974f1c400214dab02f09584d4beeba9.zip |
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
Diffstat (limited to 'drivers/infiniband/core/ucm.c')
-rw-r--r-- | drivers/infiniband/core/ucm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c index 02ca642089bd..28477565ecba 100644 --- 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); |