2 files changed, 17 insertions, 0 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 7000815277b1..a3140ed3cfe6 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -2729,9 +2729,18 @@ _scsih_host_reset(struct scsi_cmnd *scmd)
             ioc->name, scmd);
         scsi_print_command(scmd);
 
+        if (ioc->is_driver_loading) {
+                printk(MPT2SAS_INFO_FMT "Blocking the host reset\n",
+                                                          ioc->name);
+                r = FAILED;
+                goto out;
+        }
+
         retval = mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP,
             FORCE_BIG_HAMMER);
         r = (retval < 0) ? FAILED : SUCCESS;
+
+ out:
         printk(MPT2SAS_INFO_FMT "host reset: %s scmd(%p)\n",
             ioc->name, ((r == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
 
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index c3c0b45df102..5aa2ee96d0e6 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2392,9 +2392,17 @@ _scsih_host_reset(struct scsi_cmnd *scmd)
             ioc->name, scmd);
         scsi_print_command(scmd);
 
+        if (ioc->is_driver_loading) {
+                pr_info(MPT3SAS_FMT "Blocking the host reset\n",
+                    ioc->name);
+                r = FAILED;
+                goto out;
+        }
+
         retval = mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP,
             FORCE_BIG_HAMMER);
         r = (retval < 0) ? FAILED : SUCCESS;
+out:
         pr_info(MPT3SAS_FMT "host reset: %s scmd(%p)\n",
             ioc->name, ((r == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);