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

Commit 01703a15 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: Update condition for setting PA_TXHSADAPTTYPE"

parents dfa4bca1 b0956023

drivers/scsi/ufs/ufshcd.c

+3 −3
Original line number Diff line number Diff line
@@ -4985,9 +4985,9 @@ int ufshcd_dme_set_attr(struct ufs_hba *hba, u32 attr_sel, 
	} while (ret && peer && --retries);



	if (ret)

		dev_err(hba->dev, "%s: attr-id 0x%x val 0x%x failed %d retries\n",

		dev_err(hba->dev, "%s: attr-id 0x%x val 0x%x failed %d retries, err %d\n",

			set, UIC_GET_ATTR_ID(attr_sel), mib_val,

			UFS_UIC_COMMAND_RETRIES - retries);

			UFS_UIC_COMMAND_RETRIES - retries, ret);



	return ret;

}
@@ -5513,7 +5513,7 @@ int ufshcd_change_power_mode(struct ufs_hba *hba, 
		/* INITIAL ADAPT */

		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXHSADAPTTYPE),

			       PA_INITIAL_ADAPT);

	} else {

	} else if (hba->ufs_version >= UFSHCI_VERSION_30) {

		/* NO ADAPT */

		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXHSADAPTTYPE), PA_NO_ADAPT);

	}