Merge "msm: mdss: dsi: fix error handling when clk enable fails" (79c94f08) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/msm_mdss_io_8974.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -512,6 +512,11 @@ static int mdss_dsi_clk_ctrl_sub(struct mdss_dsi_ctrl_pdata *ctrl,
		{
		int rc = 0;

		if (!ctrl) {
		pr_err("%s: Invalid arg\n", __func__);
		return -EINVAL;
		}

		pr_debug("%s: ndx=%d clk_type=%08x enable=%d\n", __func__,
		ctrl->ndx, clk_type, enable);

		@@ -640,6 +645,7 @@ int mdss_dsi_clk_ctrl(struct mdss_dsi_ctrl_pdata *ctrl,
		error_mctrl_stop:
		mdss_dsi_clk_ctrl_sub(ctrl, clk_type, enable ? 0 : 1);
		error_ctrl:
		if (enable && m_changed)
		mdss_dsi_clk_ctrl_sub(mctrl, clk_type, 0);
		error_mctrl_start:
		if (clk_type & DSI_BUS_CLKS) {