rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / bnx2fc / bnx2fc_io.c

diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 454c72cdafbc8d9dae6df6ce63b4845fdaf78693..b5b5c346d7793b352066409ce85364e00c1b0ffa 100644 (file)
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1734,6 +1734,7 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req,
                printk(KERN_ERR PFX "SCp.ptr is NULL\n");
                return;
        }
+       io_req->sc_cmd = NULL;
 
        if (io_req->on_active_queue) {
                list_del_init(&io_req->link);
@@ -1753,7 +1754,6 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req,
        }
 
        bnx2fc_unmap_sg_list(io_req);
-       io_req->sc_cmd = NULL;
 
        switch (io_req->fcp_status) {
        case FC_GOOD: