diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index ce4b2ac6d6977b954d60e47e158c6c70a83ad9d8..3521eca1b2984068f27e814f1443ca401abeec9f 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -513,8 +513,10 @@ static int blk_mq_sched_alloc_tags(struct request_queue *q,
 		return -ENOMEM;
 
 	ret = blk_mq_alloc_rqs(set, hctx->sched_tags, hctx_idx, q->nr_requests);
-	if (ret)
-		blk_mq_sched_free_tags(set, hctx, hctx_idx);
+	if (ret) {
+		blk_mq_free_rq_map(hctx->sched_tags);
+		hctx->sched_tags = NULL;
+	}
 
 	return ret;
 }