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

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

Merge "ufs: qcom: set load before setting voltage in regulator"

parents b35a1e94 4e8e9e5c

drivers/scsi/ufs/ufs-qcom.c

+5 −5
Original line number Diff line number Diff line
@@ -727,6 +727,11 @@ static int ufs_qcom_config_vreg(struct device *dev, 


	reg = vreg->reg;

	if (regulator_count_voltages(reg) > 0) {

		uA_load = on ? vreg->max_uA : 0;

		ret = regulator_set_load(vreg->reg, uA_load);

		if (ret)

			goto out;



		min_uV = on ? vreg->min_uV : 0;

		ret = regulator_set_voltage(reg, min_uV, vreg->max_uV);

		if (ret) {
@@ -734,11 +739,6 @@ static int ufs_qcom_config_vreg(struct device *dev, 
					__func__, vreg->name, ret);

			goto out;

		}



		uA_load = on ? vreg->max_uA : 0;

		ret = regulator_set_load(vreg->reg, uA_load);

		if (ret)

			goto out;

	}

out:

	return ret;

drivers/scsi/ufs/ufshcd.c

+5 −5
Original line number Diff line number Diff line
@@ -8611,6 +8611,11 @@ static int ufshcd_config_vreg(struct device *dev, 
	name = vreg->name;



	if (regulator_count_voltages(reg) > 0) {

		uA_load = on ? vreg->max_uA : 0;

		ret = ufshcd_config_vreg_load(dev, vreg, uA_load);

		if (ret)

			goto out;



		min_uV = on ? vreg->min_uV : 0;

		ret = regulator_set_voltage(reg, min_uV, vreg->max_uV);

		if (ret) {
@@ -8618,11 +8623,6 @@ static int ufshcd_config_vreg(struct device *dev, 
					__func__, name, ret);

			goto out;

		}



		uA_load = on ? vreg->max_uA : 0;

		ret = ufshcd_config_vreg_load(dev, vreg, uA_load);

		if (ret)

			goto out;

	}

out:

	return ret;