diff options
author | Allen Hubbe <Allen.Hubbe@dell.com> | 2016-12-27 17:57:04 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-23 11:44:36 -0500 |
commit | 43325382fc7a216f2087d7dfdc662e30e952adf1 (patch) | |
tree | 2f887212e44c9d662e936d82cdc1d389a83ccb81 | |
parent | 215d4d62ccfd585854b17f621342762784dde8c3 (diff) |
NTB: ntb_transport: fix debugfs_remove_recursive
commit dd62245e73de9138333cb0e7a42c8bc1215c3ce6 upstream.
The call to debugfs_remove_recursive(qp->debugfs_dir) of the sub-level
directory must not be later than
debugfs_remove_recursive(nt_debugfs_dir) of the top-level directory.
Otherwise, the sub-level directory will not exist, and it would be
invalid (panic) to attempt to remove it. This removes the top-level
directory last, after sub-level directories have been cleaned up.
Signed-off-by: Allen Hubbe <Allen.Hubbe@dell.com>
Fixes: e26a5843f ("NTB: Split ntb_hw_intel and ntb_transport drivers")
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/ntb/ntb_transport.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c index 4eb8adb34508..38e9569bb856 100644 --- a/drivers/ntb/ntb_transport.c +++ b/drivers/ntb/ntb_transport.c | |||
@@ -2270,9 +2270,8 @@ module_init(ntb_transport_init); | |||
2270 | 2270 | ||
2271 | static void __exit ntb_transport_exit(void) | 2271 | static void __exit ntb_transport_exit(void) |
2272 | { | 2272 | { |
2273 | debugfs_remove_recursive(nt_debugfs_dir); | ||
2274 | |||
2275 | ntb_unregister_client(&ntb_transport_client); | 2273 | ntb_unregister_client(&ntb_transport_client); |
2276 | bus_unregister(&ntb_transport_bus); | 2274 | bus_unregister(&ntb_transport_bus); |
2275 | debugfs_remove_recursive(nt_debugfs_dir); | ||
2277 | } | 2276 | } |
2278 | module_exit(ntb_transport_exit); | 2277 | module_exit(ntb_transport_exit); |