nvme_fc: fix double calls to nvme_cleanup_cmd()

[mirror_ubuntu-bionic-kernel.git] / drivers / nvme / host / fc.c

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 158d313be84767f836142c25f2d1cf7ceb01b19e..fe6f5b71979cc5e012692a61ea91b6547105038a 100644 (file)
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1957,10 +1957,8 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue,
                                        queue->lldd_handle, &op->fcp_req);
 
        if (ret) {
-               if (op->rq) {                   /* normal request */
+               if (op->rq)                     /* normal request */
                        nvme_fc_unmap_data(ctrl, op->rq, op);
-                       nvme_cleanup_cmd(op->rq);
-               }
                /* else - aen. no cleanup needed */
 
                nvme_fc_ctrl_put(ctrl);
@@ -2078,7 +2076,6 @@ __nvme_fc_final_op_cleanup(struct request *rq)
        op->flags &= ~(FCOP_FLAGS_TERMIO | FCOP_FLAGS_RELEASED |
                        FCOP_FLAGS_COMPLETE);
 
-       nvme_cleanup_cmd(rq);
        nvme_fc_unmap_data(ctrl, rq, op);
        nvme_complete_rq(rq);
        nvme_fc_ctrl_put(ctrl);