--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2296,6 +2296,18 @@ static int vc4_hdmi_bind(struct device *
+@@ -2297,6 +2297,18 @@ static int vc4_hdmi_bind(struct device *
if (ret)
goto err_put_ddc;
if (vc4_hdmi->variant->reset)
vc4_hdmi->variant->reset(vc4_hdmi);
-@@ -2307,8 +2319,6 @@ static int vc4_hdmi_bind(struct device *
+@@ -2308,8 +2320,6 @@ static int vc4_hdmi_bind(struct device *
clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
}
drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs);
-@@ -2332,6 +2342,8 @@ static int vc4_hdmi_bind(struct device *
+@@ -2333,6 +2343,8 @@ static int vc4_hdmi_bind(struct device *
vc4_hdmi_debugfs_regs,
vc4_hdmi);
return 0;
err_free_cec:
-@@ -2342,6 +2354,7 @@ err_destroy_conn:
+@@ -2343,6 +2355,7 @@ err_destroy_conn:
vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
err_destroy_encoder:
drm_encoder_cleanup(encoder);