2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 1f539c288ae8..95e4834c58ee 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -3288,6 +3288,11 @@ static void ipr_worker_thread(struct work_struct *work)
                 return;
         }
 
+        if (!ioa_cfg->scan_enabled) {
+                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+                return;
+        }
+
 restart:
         do {
                 did_work = 0;
@@ -10362,6 +10367,7 @@ static void ipr_remove(struct pci_dev *pdev)
 static int ipr_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
 {
         struct ipr_ioa_cfg *ioa_cfg;
+        unsigned long flags;
         int rc, i;
 
         rc = ipr_probe_ioa(pdev, dev_id);
@@ -10414,7 +10420,10 @@ static int ipr_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
                 }
         }
 
+        spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
+        ioa_cfg->scan_enabled = 1;
         schedule_work(&ioa_cfg->work_q);
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
         return 0;
 }
 
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 1d42c7464dfc..cdb51960b53c 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -1478,6 +1478,7 @@ struct ipr_ioa_cfg {
         u8 in_ioa_bringdown:1;
         u8 ioa_unit_checked:1;
         u8 dump_taken:1;
+        u8 scan_enabled:1;
         u8 scan_done:1;
         u8 needs_hard_reset:1;
         u8 dual_raid:1;