1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 53c3ad64c998..ef2790faeab8 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -1141,7 +1141,8 @@ void isci_host_completion_routine(unsigned long data)
                 if (test_and_clear_bit(IREQ_ABORT_PATH_ACTIVE, &request->flags))
                         wake_up_all(&ihost->eventq);
 
-                isci_free_tag(ihost, request->io_tag);
+                if (!test_bit(IREQ_NO_AUTO_FREE_TAG, &request->flags))
+                        isci_free_tag(ihost, request->io_tag);
         }
         spin_unlock_irq(&ihost->scic_lock);