diff --git a/block/blk-mq.c b/block/blk-mq.c
index c3beaca1f4fb4da7e1a4116a152cd78110ce1876..9ae1663348ac4b0d46eda97482fef5113738758b 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2852,12 +2852,16 @@ blk_mq_alloc_hctx(struct request_queue *q, struct blk_mq_tag_set *set,
 	if (!hctx->fq)
 		goto free_bitmap;
 
-	if (hctx->flags & BLK_MQ_F_BLOCKING)
-		init_srcu_struct(hctx->srcu);
+	if (hctx->flags & BLK_MQ_F_BLOCKING) {
+		if (init_srcu_struct(hctx->srcu) != 0)
+			goto free_flush_queue;
+	}
 	blk_mq_hctx_kobj_init(hctx);
 
 	return hctx;
 
+ free_flush_queue:
+	blk_free_flush_queue(hctx->fq);
  free_bitmap:
 	sbitmap_free(&hctx->ctx_map);
  free_ctxs: