| From f08a86799ec78d365de56cbb28e9a92553d82a67 Mon Sep 17 00:00:00 2001 |
| From: Allen Hubbe <Allen.Hubbe@dell.com> |
| Date: Tue, 27 Dec 2016 17:57:04 -0500 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c |
| index d5c5894f252e..4f3eb1dde54f 100644 |
| --- a/drivers/ntb/ntb_transport.c |
| +++ b/drivers/ntb/ntb_transport.c |
| @@ -2163,9 +2163,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); |
| -- |
| 2.12.0 |
| |