2 files changed, 4 insertions, 1 deletions

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 308b3f4fc310..295e69670c39 100644
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -254,7 +254,7 @@ static void __blk_mq_unregister_dev(struct device *dev, struct request_queue *q)
                 kobject_put(&hctx->kobj);
         }
 
-        blk_mq_debugfs_unregister(q);
+        blk_mq_debugfs_unregister_hctxs(q);
 
         kobject_uevent(&q->mq_kobj, KOBJ_REMOVE);
         kobject_del(&q->mq_kobj);
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 3e204789b8d3..3ce1217778f4 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -824,6 +824,9 @@ static void blk_release_queue(struct kobject *kobj)
 
         blk_trace_shutdown(q);
 
+        if (q->mq_ops)
+                blk_mq_debugfs_unregister(q);
+
         if (q->bio_split)
                 bioset_free(q->bio_split);