1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 481afe60bc91..7f0af4fcc001 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -1403,6 +1403,7 @@ _scsih_slave_alloc(struct scsi_device *sdev)
         struct MPT2SAS_DEVICE *sas_device_priv_data;
         struct scsi_target *starget;
         struct _raid_device *raid_device;
+        struct _sas_device *sas_device;
         unsigned long flags;
 
         sas_device_priv_data = kzalloc(sizeof(struct scsi_device), GFP_KERNEL);
@@ -1431,6 +1432,19 @@ _scsih_slave_alloc(struct scsi_device *sdev)
                 spin_unlock_irqrestore(&ioc->raid_device_lock, flags);
         }
 
+        if (!(sas_target_priv_data->flags & MPT_TARGET_FLAGS_VOLUME)) {
+                spin_lock_irqsave(&ioc->sas_device_lock, flags);
+                sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc,
+                                sas_target_priv_data->sas_address);
+                if (sas_device && (sas_device->starget == NULL)) {
+                        sdev_printk(KERN_INFO, sdev,
+                             "%s : sas_device->starget set to starget @ %d\n",
+                             __func__, __LINE__);
+                        sas_device->starget = starget;
+                }
+                spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
+        }
+
         return 0;
 }