diff --git a/[refs] b/[refs] index b308dee02d0b..57e541cbf3f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a559f4ba443265b4c58925b48296f1cf81b49f9 +refs/heads/master: 1f4fe89c9c78d3163cf1e389bdc6438a44b64244 diff --git a/trunk/drivers/scsi/libsas/sas_init.c b/trunk/drivers/scsi/libsas/sas_init.c index 53ae893e8b0b..cf1b532b0e76 100644 --- a/trunk/drivers/scsi/libsas/sas_init.c +++ b/trunk/drivers/scsi/libsas/sas_init.c @@ -268,11 +268,8 @@ static int sas_phy_enable(struct sas_phy *phy, int enable) if (enable) ret = transport_sas_phy_reset(phy, 0); - else { - sas_phy_disconnected(asd_phy); - sas_ha->notify_phy_event(asd_phy, PHYE_LOSS_OF_SIGNAL); + else ret = i->dft->lldd_control_phy(asd_phy, cmd, NULL); - } } else { struct sas_rphy *rphy = dev_to_rphy(phy->dev.parent); struct domain_device *ddev = sas_find_dev_by_rphy(rphy);