diff mbox series

[v2,3/5] drm/i915/ddi: propagate errors from intel_ddi_init_hdmi_connector()

Message ID b7499c7517c867a5c4252f687d6424495f6f6587.1733324735.git.jani.nikula@intel.com (mailing list archive)
State New
Headers show
Series drm/i915/display: handle hdmi connector init failures, and no HDMI/DP cases | expand

Commit Message

Jani Nikula Dec. 4, 2024, 3:07 p.m. UTC 
Propagate connector init errors from
intel_ddi_init_hdmi_connector(). The caller already handles the
allocation failures, and this is all similar to
intel_ddi_init_dp_connector().

Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Reported-and-tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Closes: https://lore.kernel.org/r/20241031105145.2140590-1-senozhatsky@chromium.org
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_ddi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 4f9c50996446..67bbfba58b54 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4759,7 +4759,11 @@  intel_ddi_init_hdmi_connector(struct intel_digital_port *dig_port)
 		return NULL;
 
 	dig_port->hdmi.hdmi_reg = DDI_BUF_CTL(port);
-	intel_hdmi_init_connector(dig_port, connector);
+
+	if (!intel_hdmi_init_connector(dig_port, connector)) {
+		kfree(connector);
+		return NULL;
+	}
 
 	return connector;
 }