| From 2a1489df4155295be8e3c81c951f8d15474dbd31 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 19 May 2021 21:49:28 +0800 |
| Subject: drm/rockchip: cdn-dp-core: add missing clk_disable_unprepare() on |
| error in cdn_dp_grf_write() |
| |
| From: Yang Yingliang <yangyingliang@huawei.com> |
| |
| [ Upstream commit ae41d925c75b53798f289c69ee8d9f7d36432f6d ] |
| |
| After calling clk_prepare_enable(), clk_disable_unprepare() need |
| be called when calling regmap_write() failed. |
| |
| Fixes: 1a0f7ed3abe2 ("drm/rockchip: cdn-dp: add cdn DP support for rk3399") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> |
| Signed-off-by: Heiko Stuebner <heiko@sntech.de> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20210519134928.2696617-1-yangyingliang@huawei.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c |
| index a4a45daf93f2..6802d9b65f82 100644 |
| --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c |
| +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c |
| @@ -73,6 +73,7 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp, |
| ret = regmap_write(dp->grf, reg, val); |
| if (ret) { |
| DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n", ret); |
| + clk_disable_unprepare(dp->grf_clk); |
| return ret; |
| } |
| |
| -- |
| 2.30.2 |
| |
