From 15093c1e65fdd35da23473ee74e79a8fc4f734ae Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Tue, 20 Sep 2011 15:10:19 -0700
Subject: [PATCH] --- yaml --- r: 271063 b: refs/heads/master c:
 2fc62e2ac350b8f574e0a09170b350a8f2fa4a02 h: refs/heads/master i:   271061:
 a7f3105fa72eb2e956cd30d5833791f7c6438901   271059:
 7b9579f2cf63a6e3856ec85fc2b837da7334fff0   271055:
 450bc6f0abed48b3c2a5a7b1b4a446b0c5c534a5 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/scsi/scsi_transport_sas.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a40b3ce2b314..0a5ecc29aac2 100644
--- 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
index c6fcf76cade5..9d9330ae4213 100644
--- 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;