1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 723a9a8ba5ee..575142e92d9c 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1,7 +1,7 @@
 /* bnx2fc_io.c: Broadcom NetXtreme II Linux FCoE offload driver.
  * IO manager and SCSI IO processing.
  *
- * Copyright (c) 2008 - 2011 Broadcom Corporation
+ * Copyright (c) 2008 - 2013 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1270,8 +1270,11 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
 
         spin_lock_bh(&tgt->tgt_lock);
         io_req->wait_for_comp = 0;
-        if (!(test_and_set_bit(BNX2FC_FLAG_ABTS_DONE,
-                                    &io_req->req_flags))) {
+        if (test_bit(BNX2FC_FLAG_IO_COMPL, &io_req->req_flags)) {
+                BNX2FC_IO_DBG(io_req, "IO completed in a different context\n");
+                rc = SUCCESS;
+        } else if (!(test_and_set_bit(BNX2FC_FLAG_ABTS_DONE,
+                                      &io_req->req_flags))) {
                 /* Let the scsi-ml try to recover this command */
                 printk(KERN_ERR PFX "abort failed, xid = 0x%x\n",
                        io_req->xid);