Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b0b5685 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufshcd: keep device rails on if link is not in OFF state"

parents 3b673111 829a9e8a

drivers/scsi/ufs/ufshcd.c

+2 −2
Original line number Diff line number Diff line
@@ -5292,7 +5292,7 @@ static void ufshcd_vreg_set_lpm(struct ufs_hba *hba) 
	 * Ignore the error returned by ufshcd_toggle_vreg() as device is anyway

	 * in low power state which would save some power.

	 */

	if (ufshcd_is_ufs_dev_poweroff(hba) &&

	if (ufshcd_is_ufs_dev_poweroff(hba) && ufshcd_is_link_off(hba) &&

	    !hba->dev_info.is_lu_power_on_wp) {

		ufshcd_setup_vreg(hba, false);

	} else if (!ufshcd_is_ufs_dev_active(hba)) {
@@ -5308,7 +5308,7 @@ static int ufshcd_vreg_set_hpm(struct ufs_hba *hba) 
{

	int ret = 0;



	if (ufshcd_is_ufs_dev_poweroff(hba) &&

	if (ufshcd_is_ufs_dev_poweroff(hba) && ufshcd_is_link_off(hba) &&

	    !hba->dev_info.is_lu_power_on_wp) {

		ret = ufshcd_setup_vreg(hba, true);

	} else if (!ufshcd_is_ufs_dev_active(hba)) {