1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index 48765aa84328..a3a6487264ea 100644
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -243,8 +243,11 @@ enum sci_status isci_remote_device_terminate_requests(
                                          idev->rnc.destination_state,
                                          ireq, ireq->flags);
                         }
+                        spin_lock_irqsave(&ihost->scic_lock, flags);
                         clear_bit(IREQ_NO_AUTO_FREE_TAG, &ireq->flags);
-                        isci_free_tag(ihost, ireq->io_tag);
+                        if (!test_bit(IREQ_ABORT_PATH_ACTIVE, &ireq->flags))
+                                isci_free_tag(ihost, ireq->io_tag);
+                        spin_unlock_irqrestore(&ihost->scic_lock, flags);
                 } else {
                         /* Terminate all TCs. */
                         sci_remote_device_terminate_requests(idev);