2 files changed, 2 insertions, 3 deletions

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index ed96474d75cb..ec2d11915142 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -641,6 +641,7 @@ void blk_mq_free_tags(struct blk_mq_tags *tags)
 {
         bt_free(&tags->bitmap_tags);
         bt_free(&tags->breserved_tags);
+        free_cpumask_var(tags->cpumask);
         kfree(tags);
 }
 
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 7785ae96267a..85f014327342 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2296,10 +2296,8 @@ void blk_mq_free_tag_set(struct blk_mq_tag_set *set)
         int i;
 
         for (i = 0; i < set->nr_hw_queues; i++) {
-                if (set->tags[i]) {
+                if (set->tags[i])
                         blk_mq_free_rq_map(set, set->tags[i], i);
-                        free_cpumask_var(set->tags[i]->cpumask);
-                }
         }
 
         kfree(set->tags);