[SCSI] mpt2sas: Early return from function if shost is in recovery.

Aded checks for shost_recovery flag for early return from function.

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 9ad4b48a9b62..b7b6285a3061 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -3521,7 +3521,9 @@ mpt2sas_base_free_resources(struct MPT2SAS_ADAPTER *ioc)
             __func__));
 
         _base_mask_interrupts(ioc);
+        ioc->shost_recovery = 1;
         _base_make_ioc_ready(ioc, CAN_SLEEP, SOFT_RESET);
+        ioc->shost_recovery = 0;
         if (ioc->pci_irq) {
                 synchronize_irq(pdev->irq);
                 free_irq(ioc->pci_irq, ioc);
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index f3ce9b1825b1..61199759f8d1 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -1979,7 +1979,7 @@ mpt2sas_scsih_issue_tm(struct MPT2SAS_ADAPTER *ioc, u16 handle, uint lun,
                 return;
         }
 
-        if (ioc->shost_recovery) {
+        if (ioc->shost_recovery || ioc->remove_host) {
                 printk(MPT2SAS_INFO_FMT "%s: host reset in progress!\n",
                     __func__, ioc->name);
                 return;
@@ -4246,7 +4246,7 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,
                 _scsih_sas_topology_change_event_debug(ioc, event_data);
 #endif
 
-        if (ioc->shost_recovery)
+        if (ioc->shost_recovery || ioc->remove_host)
                 return;
 
         if (!ioc->sas_hba.num_phys)
@@ -4285,7 +4285,7 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,
                             "expander event\n", ioc->name));
                         return;
                 }
-                if (ioc->shost_recovery)
+                if (ioc->shost_recovery || ioc->remove_host)
                         return;
                 phy_number = event_data->StartPhyNum + i;
                 reason_code = event_data->PHY[i].PhyStatus &