1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 08bf5fa6afd..10a5436aff7 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -666,13 +666,10 @@ static void fc_exch_timeout(struct work_struct *work)
                 if (e_stat & ESB_ST_ABNORMAL)
                         rc = fc_exch_done_locked(ep);
                 spin_unlock_bh(&ep->ex_lock);
+                if (!rc)
+                        fc_exch_delete(ep);
                 if (resp)
                         resp(sp, ERR_PTR(-FC_EX_TIMEOUT), arg);
-                if (!rc) {
-                        /* delete the exchange if it's already being aborted */
-                        fc_exch_delete(ep);
-                        return;
-                }
                 fc_seq_exch_abort(sp, 2 * ep->r_a_tov);
                 goto done;
         }