diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index e7d5385ebc0b018629dd22ebd43c20891df78f99..1e6aa0731719a50c8c0bb1c70f187a54723753ff 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1167,11 +1167,7 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctrl *ctrl, bool new)
 		nvme_rdma_destroy_io_queues(ctrl, new);
 	}
 destroy_admin:
-	nvme_stop_admin_queue(&ctrl->ctrl);
-	blk_sync_queue(ctrl->ctrl.admin_q);
-	nvme_rdma_stop_queue(&ctrl->queues[0]);
-	nvme_cancel_admin_tagset(&ctrl->ctrl);
-	nvme_rdma_destroy_admin_queue(ctrl, new);
+	nvme_rdma_teardown_admin_queue(ctrl, new);
 	return ret;
 }