Merge "clk: msm: clock-pll: Always set the rate in variable-rate pll handoff" (c83d8a51) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/clk/msm/clock-pll.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -623,10 +623,9 @@ static enum handoff variable_rate_pll_handoff(struct clk *c)

		pll->src_rate = clk_get_rate(c->parent);

		if ((mode & mask) != mask)
		return HANDOFF_DISABLED_CLK;

		lval = readl_relaxed(PLL_L_REG(pll));
		if (!lval)
		return HANDOFF_DISABLED_CLK;

		c->rate = pll->src_rate * lval;

		@@ -635,6 +634,9 @@ static enum handoff variable_rate_pll_handoff(struct clk *c)
		return HANDOFF_DISABLED_CLK;
		}

		if ((mode & mask) != mask)
		return HANDOFF_DISABLED_CLK;

		return HANDOFF_ENABLED_CLK;
		}