1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index fd382fe33f6e..ce0ce3e32f33 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -268,17 +268,6 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg)
 
         orig_io_req = cb_arg->aborted_io_req;
         srr_req = cb_arg->io_req;
-        if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags)) {
-                BNX2FC_IO_DBG(srr_req, "srr_compl: xid - 0x%x completed",
-                        orig_io_req->xid);
-                goto srr_compl_done;
-        }
-        if (test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {
-                BNX2FC_IO_DBG(srr_req, "rec abts in prog "
-                       "orig_io - 0x%x\n",
-                        orig_io_req->xid);
-                goto srr_compl_done;
-        }
         if (test_and_clear_bit(BNX2FC_FLAG_ELS_TIMEOUT, &srr_req->req_flags)) {
                 /* SRR timedout */
                 BNX2FC_IO_DBG(srr_req, "srr timed out, abort "
@@ -290,6 +279,12 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg)
                                 "failed. issue cleanup\n");
                         bnx2fc_initiate_cleanup(srr_req);
                 }
+                if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags) ||
+                    test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {
+                        BNX2FC_IO_DBG(srr_req, "srr_compl:xid 0x%x flags = %lx",
+                                      orig_io_req->xid, orig_io_req->req_flags);
+                        goto srr_compl_done;
+                }
                 orig_io_req->srr_retry++;
                 if (orig_io_req->srr_retry <= SRR_RETRY_COUNT) {
                         struct bnx2fc_rport *tgt = orig_io_req->tgt;
@@ -311,6 +306,12 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg)
                 }
                 goto srr_compl_done;
         }
+        if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags) ||
+            test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {
+                BNX2FC_IO_DBG(srr_req, "srr_compl:xid - 0x%x flags = %lx",
+                              orig_io_req->xid, orig_io_req->req_flags);
+                goto srr_compl_done;
+        }
         mp_req = &(srr_req->mp_req);
         fc_hdr = &(mp_req->resp_fc_hdr);
         resp_len = mp_req->resp_len;