1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index 9fde174ce396..2957a3763f01 100644
--- a/drivers/md/dm-rq.c
+++ b/drivers/md/dm-rq.c
@@ -831,6 +831,7 @@ out_tag_set:
         blk_mq_free_tag_set(md->tag_set);
 out_kfree_tag_set:
         kfree(md->tag_set);
+        md->tag_set = NULL;
 
         return err;
 }
@@ -840,6 +841,7 @@ void dm_mq_cleanup_mapped_device(struct mapped_device *md)
         if (md->tag_set) {
                 blk_mq_free_tag_set(md->tag_set);
                 kfree(md->tag_set);
+                md->tag_set = NULL;
         }
 }