diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-24 12:03:18 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-24 12:03:18 +0800 |
| commit | aedb4a24b9ae4fbd6ced45ae64ae3d84b423f5c2 (patch) | |
| tree | 222bb3ce7eb552c8f92bd836bb0b9dcad0020cb3 /drivers/ntb/ntb_transport.c | |
| parent | 332efa4adbb90f2e335a405504fdfa6c1469701e (diff) | |
| parent | f1924ac09c968c94c922b723979d344b8ff106cd (diff) | |
Merge tag 'v4.4.51' into linux-linaro-lsk-v4.4
This is the 4.4.51 stable release
Diffstat (limited to 'drivers/ntb/ntb_transport.c')
| -rw-r--r-- | drivers/ntb/ntb_transport.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c index 60654d524858..ecc6fb9ca92f 100644 --- a/drivers/ntb/ntb_transport.c +++ b/drivers/ntb/ntb_transport.c @@ -1623,7 +1623,7 @@ ntb_transport_create_queue(void *data, struct device *client_dev, node = dev_to_node(&ndev->dev); - free_queue = ffs(nt->qp_bitmap); + free_queue = ffs(nt->qp_bitmap_free); if (!free_queue) goto err; @@ -2082,9 +2082,8 @@ module_init(ntb_transport_init); static void __exit ntb_transport_exit(void) { - debugfs_remove_recursive(nt_debugfs_dir); - ntb_unregister_client(&ntb_transport_client); bus_unregister(&ntb_transport_bus); + debugfs_remove_recursive(nt_debugfs_dir); } module_exit(ntb_transport_exit); |