提交 f0cee68b 编写于 作者: B Brian Norris 提交者: Zheng Zengkai

drm/rockchip: dsi: Fix unbalanced clock on probe error

stable inclusion
from stable-v5.10.94
commit 8ccaafa1caf0702194c77e71a853ac5c4c0b429b
bugzilla: https://gitee.com/openeuler/kernel/issues/I531X9

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8ccaafa1caf0702194c77e71a853ac5c4c0b429b

--------------------------------

[ Upstream commit 25188839 ]

Our probe() function never enabled this clock, so we shouldn't disable
it if we fail to probe the bridge.

Noted by inspection.

Fixes: 2d4f7bda ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver")
Signed-off-by: NBrian Norris <briannorris@chromium.org>
Reviewed-by: NChen-Yu Tsai <wenst@chromium.org>
Tested-by: NNícolas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: NHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210928143413.v3.3.Ie8ceefb51ab6065a1151869b6fcda41a467d4d2c@changeidSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 3809f839
......@@ -1126,14 +1126,10 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev)
if (ret != -EPROBE_DEFER)
DRM_DEV_ERROR(dev,
"Failed to probe dw_mipi_dsi: %d\n", ret);
goto err_clkdisable;
return ret;
}
return 0;
err_clkdisable:
clk_disable_unprepare(dsi->pllref_clk);
return ret;
}
static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册