Merge branch 'omap_clock_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes

[pandora-kernel.git] / drivers / scsi / scsi_transport_sas.c

diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index c6fcf76..9d9330a 100644 (file)
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/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;