diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/scsi_transport_sas.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c index fb6641b42dfa..a3e0b7bc2d7b 100644 --- a/drivers/scsi/scsi_transport_sas.c +++ b/drivers/scsi/scsi_transport_sas.c | |||
@@ -638,7 +638,7 @@ int sas_rphy_add(struct sas_rphy *rphy) | |||
638 | mutex_unlock(&sas_host->lock); | 638 | mutex_unlock(&sas_host->lock); |
639 | 639 | ||
640 | if (rphy->scsi_target_id != -1) { | 640 | if (rphy->scsi_target_id != -1) { |
641 | scsi_scan_target(&rphy->dev, parent->number, | 641 | scsi_scan_target(&rphy->dev, parent->port_identifier, |
642 | rphy->scsi_target_id, ~0, 0); | 642 | rphy->scsi_target_id, ~0, 0); |
643 | } | 643 | } |
644 | 644 | ||
@@ -745,9 +745,9 @@ static int sas_user_scan(struct Scsi_Host *shost, uint channel, | |||
745 | if (rphy->scsi_target_id == -1) | 745 | if (rphy->scsi_target_id == -1) |
746 | continue; | 746 | continue; |
747 | 747 | ||
748 | if ((channel == SCAN_WILD_CARD || channel == parent->number) && | 748 | if ((channel == SCAN_WILD_CARD || channel == parent->port_identifier) && |
749 | (id == SCAN_WILD_CARD || id == rphy->scsi_target_id)) { | 749 | (id == SCAN_WILD_CARD || id == rphy->scsi_target_id)) { |
750 | scsi_scan_target(&rphy->dev, parent->number, | 750 | scsi_scan_target(&rphy->dev, parent->port_identifier, |
751 | rphy->scsi_target_id, lun, 1); | 751 | rphy->scsi_target_id, lun, 1); |
752 | } | 752 | } |
753 | } | 753 | } |