Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[karo-tx-linux.git] / drivers / scsi / libsas / sas_expander.c

diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 14e3244c1b20768c106bed89710b86ef4dddc164..05acd9e35fc4def9872d8b19debdb2875302b65b 100644 (file)
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -251,6 +251,8 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, void *rsp)
        phy->phy->identify.device_type = dr->attached_dev_type;
        phy->phy->identify.initiator_port_protocols = phy->attached_iproto;
        phy->phy->identify.target_port_protocols = phy->attached_tproto;
+       if (!phy->attached_tproto && dr->attached_sata_dev)
+               phy->phy->identify.target_port_protocols = SAS_PROTOCOL_SATA;
        phy->phy->identify.phy_identifier = phy_id;
        phy->phy->minimum_linkrate_hw = dr->hmin_linkrate;
        phy->phy->maximum_linkrate_hw = dr->hmax_linkrate;