summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@steeleye.com>2006-04-14 16:47:59 +0200
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-04-14 22:33:41 +0200
commit7676f83aeb774e7a3abe6af06ec92b29488b5b79 (patch)
tree6ee81be2aafdeee2665862bc47821d4bf4285857 /drivers/scsi
parent[SCSI] mptfusion - fix panic in mptsas_slave_configure (diff)
downloadlinux-7676f83aeb774e7a3abe6af06ec92b29488b5b79.tar.xz
linux-7676f83aeb774e7a3abe6af06ec92b29488b5b79.zip
[SCSI] scsi_transport_sas: don't scan a non-existent end device
Any end device that can't support any of the scanning protocols shouldn't be scanned, so set its id to -1 to prevent scsi_scan_target() being called for it. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/scsi_transport_sas.c2
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 &&