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

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

Merge "msm: mdss: Avoid disabling regulator again which is disabled"

parents 2c3dbc95 a76bd782

drivers/video/msm/mdss/mdss_io_util.c

+4 −1
Original line number Diff line number Diff line
@@ -300,7 +300,10 @@ int msm_dss_enable_vreg(struct dss_vreg *in_vreg, int num_vreg, int enable) 
					in_vreg[i].pre_off_sleep * 1000);

			regulator_set_optimum_mode(in_vreg[i].vreg,

				in_vreg[i].load[DSS_REG_MODE_DISABLE]);



			if (regulator_is_enabled(in_vreg[i].vreg))

				regulator_disable(in_vreg[i].vreg);



			if (in_vreg[i].post_off_sleep)

				usleep_range(in_vreg[i].post_off_sleep * 1000,

					in_vreg[i].post_off_sleep * 1000);