mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
drm/rockchip: lvds: fix PM usage counter unbalance in poweron
[ Upstream commit4dba27f1a1
] pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. We fix it by replacing it with the newest pm_runtime_resume_and_get to keep usage counter balanced. Fixes:34cc0aa254
("drm/rockchip: Add support for Rockchip Soc LVDS") Fixes:cca1705c3d
("drm/rockchip: lvds: Add PX30 support") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://patchwork.freedesktop.org/patch/msgid/20220922132107.105419-3-zhangqilong3@huawei.com Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
13fab6322b
commit
f6ed73db39
1 changed files with 7 additions and 3 deletions
|
@ -145,7 +145,7 @@ static int rk3288_lvds_poweron(struct rockchip_lvds *lvds)
|
|||
DRM_DEV_ERROR(lvds->dev, "failed to enable lvds pclk %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
ret = pm_runtime_get_sync(lvds->dev);
|
||||
ret = pm_runtime_resume_and_get(lvds->dev);
|
||||
if (ret < 0) {
|
||||
DRM_DEV_ERROR(lvds->dev, "failed to get pm runtime: %d\n", ret);
|
||||
clk_disable(lvds->pclk);
|
||||
|
@ -329,16 +329,20 @@ static int px30_lvds_poweron(struct rockchip_lvds *lvds)
|
|||
{
|
||||
int ret;
|
||||
|
||||
ret = pm_runtime_get_sync(lvds->dev);
|
||||
ret = pm_runtime_resume_and_get(lvds->dev);
|
||||
if (ret < 0) {
|
||||
DRM_DEV_ERROR(lvds->dev, "failed to get pm runtime: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Enable LVDS mode */
|
||||
return regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON1,
|
||||
ret = regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON1,
|
||||
PX30_LVDS_MODE_EN(1) | PX30_LVDS_P2S_EN(1),
|
||||
PX30_LVDS_MODE_EN(1) | PX30_LVDS_P2S_EN(1));
|
||||
if (ret)
|
||||
pm_runtime_put(lvds->dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void px30_lvds_poweroff(struct rockchip_lvds *lvds)
|
||||
|
|
Loading…
Reference in a new issue