aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mpt2sas
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/mpt2sas')
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_transport.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c
index 2727c3b6510..778e149f963 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_transport.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c
@@ -1007,18 +1007,18 @@ static int
1007_transport_get_enclosure_identifier(struct sas_rphy *rphy, u64 *identifier) 1007_transport_get_enclosure_identifier(struct sas_rphy *rphy, u64 *identifier)
1008{ 1008{
1009 struct MPT2SAS_ADAPTER *ioc = rphy_to_ioc(rphy); 1009 struct MPT2SAS_ADAPTER *ioc = rphy_to_ioc(rphy);
1010 struct _sas_node *sas_expander; 1010 struct _sas_device *sas_device;
1011 unsigned long flags; 1011 unsigned long flags;
1012 1012
1013 spin_lock_irqsave(&ioc->sas_node_lock, flags); 1013 spin_lock_irqsave(&ioc->sas_device_lock, flags);
1014 sas_expander = mpt2sas_scsih_expander_find_by_sas_address(ioc, 1014 sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc,
1015 rphy->identify.sas_address); 1015 rphy->identify.sas_address);
1016 spin_unlock_irqrestore(&ioc->sas_node_lock, flags); 1016 spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
1017 1017
1018 if (!sas_expander) 1018 if (!sas_device)
1019 return -ENXIO; 1019 return -ENXIO;
1020 1020
1021 *identifier = sas_expander->enclosure_logical_id; 1021 *identifier = sas_device->enclosure_logical_id;
1022 return 0; 1022 return 0;
1023} 1023}
1024 1024