Merge "scsi: ufs: fix issue with scaling up gear"

This commit is contained in:
Linux Build Service Account 2017-04-21 00:37:31 -07:00 committed by Gerrit - the friendly Code Review server
commit d7eb0a4d7f

View file

@ -9238,10 +9238,11 @@ static int ufshcd_scale_gear(struct ufs_hba *hba, bool scale_up)
/* scale up to G3 now */
new_pwr_info.gear_tx = UFS_HS_G3;
new_pwr_info.gear_rx = UFS_HS_G3;
ret = ufshcd_change_power_mode(hba, &new_pwr_info);
if (ret)
goto out;
/* now, fall through to set the HS-G3 */
}
ret = ufshcd_change_power_mode(hba, &new_pwr_info);
if (ret)
goto out;
} else {
memcpy(&new_pwr_info, &hba->pwr_info,
sizeof(struct ufs_pa_layer_attr));