summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsai Thambi S P <asamymuthupa@micron.com>2014-04-16 20:30:16 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-06 18:57:26 -0700
commit86054bac86caa6198bba925eb1eb5701a2bfae6f (patch)
tree182cd331abfecf1868bdd4c78c5cffb1bc10938b
parent9b7aca41c47f31a4f3754769a23fcd8b434675c4 (diff)
mtip32xx: Remove dfs_parent after pci unregister
commit af5ded8ccf21627f9614afc03b356712666ed225 upstream. In module exit, dfs_parent and it's subtree were removed before unregistering with pci. When debugfs entry for each device is attempted to remove in pci_remove() context, they don't exist, as dfs_parent and its children were already ripped apart. Modified to first unregister with pci and then remove dfs_parent. Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com> Signed-off-by: Jens Axboe <axboe@fb.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/block/mtip32xx/mtip32xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 47b6f7b6e1ef..4e763b0dbbfc 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -4990,13 +4990,13 @@ static int __init mtip_init(void)
*/
static void __exit mtip_exit(void)
{
- debugfs_remove_recursive(dfs_parent);
-
/* Release the allocated major block device number. */
unregister_blkdev(mtip_major, MTIP_DRV_NAME);
/* Unregister the PCI driver. */
pci_unregister_driver(&mtip_pci_driver);
+
+ debugfs_remove_recursive(dfs_parent);
}
MODULE_AUTHOR("Micron Technology, Inc");