Merge "scsi: ufs: set load before setting voltage in regulators" (c803ca5b) · Commits · e / devices / android_kernel_sony_msm8998

drivers/scsi/ufs/ufshcd.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -7997,6 +7997,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) {
		@@ -8004,11 +8009,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;