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/ucm.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/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 02ca642089b..28477565ecb 100644 --- a/drivers/infiniband/core/ucm.c +++ b/drivers/infiniband/core/ucm.c | |||
@@ -1450,6 +1450,7 @@ static void __exit ib_ucm_cleanup(void) | |||
1450 | ib_unregister_client(&ucm_client); | 1450 | ib_unregister_client(&ucm_client); |
1451 | class_unregister(&ucm_class); | 1451 | class_unregister(&ucm_class); |
1452 | unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES); | 1452 | unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES); |
1453 | idr_destroy(&ctx_id_table); | ||
1453 | } | 1454 | } |
1454 | 1455 | ||
1455 | module_init(ib_ucm_init); | 1456 | module_init(ib_ucm_init); |