]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/sun4i: hdmi: Fix another error handling path in 'sun4i_hdmi_bind()'
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sun, 18 Mar 2018 22:48:10 +0000 (23:48 +0100)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Tue, 20 Mar 2018 10:50:28 +0000 (11:50 +0100)
If we can not get the HDMI DDC clock, we still need to free some
resources before returning.

Fixes: 939d749ad664 ("drm/sun4i: hdmi: Add support for controller hardware variants")
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5e0084af4ad57e9eea3bca5bd8e2e95970cd6714.1521413031.git.christophe.jaillet@wanadoo.fr
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

index d2839727bb0b3f7e9917abdb361d675b580a47e8..fa4bcd092eaf20f9f04faaaf49ca9339f134f385 100644 (file)
@@ -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;