---

yaml --- r: 271063 b: refs/heads/master c: 2fc62e2 h: refs/heads/master i: 271061: a7f3105 271059: 7b9579f 271055: 450bc6f v: v3
git-mirror · Oct 2, 2011 · 15093c1 · 15093c1
1 parent dec9626
commit 15093c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffaac8f45bfb2dffb78179baa5740de34058eef8
+refs/heads/master: 2fc62e2ac350b8f574e0a09170b350a8f2fa4a02
diff --git a/trunk/drivers/scsi/scsi_transport_sas.c b/trunk/drivers/scsi/scsi_transport_sas.c
@@ -1545,8 +1545,14 @@ int sas_rphy_add(struct sas_rphy *rphy)
 
 	if (identify->device_type == SAS_END_DEVICE &&
 	    rphy->scsi_target_id != -1) {
-		scsi_scan_target(&rphy->dev, 0,
-				rphy->scsi_target_id, SCAN_WILD_CARD, 0);
+		int lun;
+
+		if (identify->target_port_protocols & SAS_PROTOCOL_SSP)
+			lun = SCAN_WILD_CARD;
+		else
+			lun = 0;
+
+		scsi_scan_target(&rphy->dev, 0, rphy->scsi_target_id, lun, 0);
 	}
 
 	return 0;