diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-11-10 19:22:23 +0100 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-11-10 19:22:23 +0100 |
| commit | 8a57646d28540b2a536f168df63b1b043b1d3386 (patch) | |
| tree | 3cfd840a3f3302e848212eb892dd231f15a2f96b /drivers/scsi/mpt3sas/mpt3sas_scsih.c | |
| parent | Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes (diff) | |
| parent | scsi: megaraid_sas: fix macro MEGASAS_IS_LOGICAL to avoid regression (diff) | |
| download | linux-8a57646d28540b2a536f168df63b1b043b1d3386.tar.xz linux-8a57646d28540b2a536f168df63b1b043b1d3386.zip | |
Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi/mpt3sas/mpt3sas_scsih.c')
| -rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 209a969a979d..8aa769a2d919 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -1273,9 +1273,9 @@ scsih_target_alloc(struct scsi_target *starget) sas_target_priv_data->handle = raid_device->handle; sas_target_priv_data->sas_address = raid_device->wwid; sas_target_priv_data->flags |= MPT_TARGET_FLAGS_VOLUME; - sas_target_priv_data->raid_device = raid_device; if (ioc->is_warpdrive) - raid_device->starget = starget; + sas_target_priv_data->raid_device = raid_device; + raid_device->starget = starget; } spin_unlock_irqrestore(&ioc->raid_device_lock, flags); return 0; |