]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/rockchip: cdn-dp-core: add missing clk_disable_unprepare() on error in cdn_dp_grf...
authorYang Yingliang <yangyingliang@huawei.com>
Wed, 19 May 2021 13:49:28 +0000 (21:49 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:15:49 +0000 (16:15 +0200)
[ 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

index 8ad0d773dc33a63c09a8bc246b4ceb7920e10f94..3feab563e50a7e40232b43e9d2bc2c8b9d14a4f4 100644 (file)
@@ -81,6 +81,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;
        }