diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index 6edffeed99534935f320b5b3d6e941dad15a968d..18aae28845ec999cbbe126e9d61dfce9e3f98027 100644
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -494,6 +494,7 @@ void mmc_cleanup_queue(struct mmc_queue *mq)
 		blk_mq_unquiesce_queue(q);
 
 	blk_cleanup_queue(q);
+	blk_mq_free_tag_set(&mq->tag_set);
 
 	/*
 	 * A request can be completed before the next request, potentially