Merge remote-tracking branch 'scsi/for-next'

[deliverable/linux.git] / drivers / scsi / libfc / fc_exch.c

diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index e72673b0a8fb4ba810097a4c57b8cc3d3b8d199f..16ca31ad5ec0abba2d0b08ad1d337ff8afcbbd9a 100644 (file)
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -1837,7 +1837,6 @@ static void fc_exch_reset(struct fc_exch *ep)
        int rc = 1;
 
        spin_lock_bh(&ep->ex_lock);
-       fc_exch_abort_locked(ep, 0);
        ep->state |= FC_EX_RST_CLEANUP;
        fc_exch_timer_cancel(ep);
        if (ep->esb_stat & ESB_ST_REC_QUAL)