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

Unverified Commit 1bc659eb authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Maxime Ripard
Browse files

drm/sun4i: hdmi: Fix another error handling path in 'sun4i_hdmi_bind()' 



If we can not get the HDMI DDC clock, we still need to free some
resources before returning.

Fixes: 939d749a ("drm/sun4i: hdmi: Add support for controller hardware variants")
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5e0084af4ad57e9eea3bca5bd8e2e95970cd6714.1521413031.git.christophe.jaillet@wanadoo.fr
parent 8250e6ca

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -552,7 +552,8 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master, 
		hdmi->ddc_parent_clk = devm_clk_get(dev, "ddc");

		if (IS_ERR(hdmi->ddc_parent_clk)) {

			dev_err(dev, "Couldn't get the HDMI DDC clock\n");

			return PTR_ERR(hdmi->ddc_parent_clk);

			ret = PTR_ERR(hdmi->ddc_parent_clk);

			goto err_disable_mod_clk;

		}

	} else {

		hdmi->ddc_parent_clk = hdmi->tmds_clk;