|
@@ -778,7 +778,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
|
|
|
if (error) {
|
|
|
dev_err(ctrl->ctrl.device,
|
|
|
"prop_get NVME_REG_CAP failed\n");
|
|
|
- goto out_cleanup_queue;
|
|
|
+ goto out_stop_queue;
|
|
|
}
|
|
|
|
|
|
ctrl->ctrl.sqsize =
|
|
@@ -786,23 +786,25 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
|
|
|
|
|
|
error = nvme_enable_ctrl(&ctrl->ctrl, ctrl->ctrl.cap);
|
|
|
if (error)
|
|
|
- goto out_cleanup_queue;
|
|
|
+ goto out_stop_queue;
|
|
|
|
|
|
ctrl->ctrl.max_hw_sectors =
|
|
|
(ctrl->max_fr_pages - 1) << (ilog2(SZ_4K) - 9);
|
|
|
|
|
|
error = nvme_init_identify(&ctrl->ctrl);
|
|
|
if (error)
|
|
|
- goto out_cleanup_queue;
|
|
|
+ goto out_stop_queue;
|
|
|
|
|
|
error = nvme_rdma_alloc_qe(ctrl->queues[0].device->dev,
|
|
|
&ctrl->async_event_sqe, sizeof(struct nvme_command),
|
|
|
DMA_TO_DEVICE);
|
|
|
if (error)
|
|
|
- goto out_cleanup_queue;
|
|
|
+ goto out_stop_queue;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
+out_stop_queue:
|
|
|
+ nvme_rdma_stop_queue(&ctrl->queues[0]);
|
|
|
out_cleanup_queue:
|
|
|
if (new)
|
|
|
blk_cleanup_queue(ctrl->ctrl.admin_q);
|