Merge "msm: clock-mdss-8974: Proper hdmi set rate" (c5f82809) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/clock-mdss-8974.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -2428,11 +2428,9 @@ static int hdmi_vco_prepare(struct clk *c)

		pr_debug("%s: rate=%ld\n", __func__, vco->rate);

		if (!vco->rate_set)
		if (!vco->rate_set && vco->rate)
		ret = hdmi_vco_set_rate(c, vco->rate);

		vco->rate_set = false;

		if (!ret)
		ret = clk_prepare(mdss_ahb_clk);

		@@ -2441,6 +2439,10 @@ static int hdmi_vco_prepare(struct clk *c)

		static void hdmi_vco_unprepare(struct clk *c)
		{
		struct hdmi_pll_vco_clk *vco = to_hdmi_vco_clk(c);

		vco->rate_set = false;

		clk_unprepare(mdss_ahb_clk);
		}