1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 2c96fc5683ff..8b6d65e21bae 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -845,6 +845,8 @@ int sas_rphy_add(struct sas_rphy *rphy)
             (identify->target_port_protocols &
              (SAS_PROTOCOL_SSP|SAS_PROTOCOL_STP|SAS_PROTOCOL_SATA)))
                 rphy->scsi_target_id = sas_host->next_target_id++;
+        else if (identify->device_type == SAS_END_DEVICE)
+                rphy->scsi_target_id = -1;
         mutex_unlock(&sas_host->lock);
 
         if (identify->device_type == SAS_END_DEVICE &&