Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bf73d5e authored by Sascha Hauer's avatar Sascha Hauer Committed by Greg Kroah-Hartman
Browse files

drm/rockchip: dw_hdmi: Do not leave clock enabled in error case 



[ Upstream commit c0cfbb122275da1b726481de5a8cffeb24e6322b ]

The driver returns an error when devm_phy_optional_get() fails leaving
the previously enabled clock turned on. Change order and enable the
clock only after the phy has been acquired.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220126145549.617165-3-s.hauer@pengutronix.de


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5a21d507

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

+7 −7
Original line number Diff line number Diff line
@@ -528,13 +528,6 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, 
		return ret;

	}



	ret = clk_prepare_enable(hdmi->vpll_clk);

	if (ret) {

		DRM_DEV_ERROR(hdmi->dev, "Failed to enable HDMI vpll: %d\n",

			      ret);

		return ret;

	}



	hdmi->phy = devm_phy_optional_get(dev, "hdmi");

	if (IS_ERR(hdmi->phy)) {

		ret = PTR_ERR(hdmi->phy);
@@ -543,6 +536,13 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, 
		return ret;

	}



	ret = clk_prepare_enable(hdmi->vpll_clk);

	if (ret) {

		DRM_DEV_ERROR(hdmi->dev, "Failed to enable HDMI vpll: %d\n",

			      ret);

		return ret;

	}



	drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);

	drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs,

			 DRM_MODE_ENCODER_TMDS, NULL);