xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 251888398753924059f3bb247a44153a2853137f ]

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

Noted by inspection.

Fixes: 2d4f7bdafd ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210928143413.v3.3.Ie8ceefb51ab6065a1151869b6fcda41a467d4d2c@changeid
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Brian Norris
2021-09-28 14:35:51 -07:00
committed by Greg Kroah-Hartman
parent 9bc19022aa
commit 8ccaafa1ca
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
View File

@@ -1126,14 +1126,10 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev)
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
DRM_DEV_ERROR(dev, DRM_DEV_ERROR(dev,
"Failed to probe dw_mipi_dsi: %d\n", ret); "Failed to probe dw_mipi_dsi: %d\n", ret);
goto err_clkdisable; return ret;
} }
return 0; return 0;
err_clkdisable:
clk_disable_unprepare(dsi->pllref_clk);
return ret;
} }
static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev) static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)