drm_connector_init_with_ddc() can fail, but the call in
drm_bridge_connector_init() does not check that.  Fix this by adding
the missing error handling.

Signed-off-by: Geert Uytterhoeven <geert+rene...@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
---
v2:
  - Move declaration of ret to its own line,
  - Add Reviewed-by.
---
 drivers/gpu/drm/drm_bridge_connector.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_bridge_connector.c 
b/drivers/gpu/drm/drm_bridge_connector.c
index 19ae4a177ac386b2..1f6fc9b0ae649f54 100644
--- a/drivers/gpu/drm/drm_bridge_connector.c
+++ b/drivers/gpu/drm/drm_bridge_connector.c
@@ -318,6 +318,7 @@ struct drm_connector *drm_bridge_connector_init(struct 
drm_device *drm,
        struct i2c_adapter *ddc = NULL;
        struct drm_bridge *bridge, *panel_bridge = NULL;
        int connector_type;
+       int ret;
 
        bridge_connector = kzalloc(sizeof(*bridge_connector), GFP_KERNEL);
        if (!bridge_connector)
@@ -368,8 +369,14 @@ struct drm_connector *drm_bridge_connector_init(struct 
drm_device *drm,
                return ERR_PTR(-EINVAL);
        }
 
-       drm_connector_init_with_ddc(drm, connector, &drm_bridge_connector_funcs,
-                                   connector_type, ddc);
+       ret = drm_connector_init_with_ddc(drm, connector,
+                                         &drm_bridge_connector_funcs,
+                                         connector_type, ddc);
+       if (ret) {
+               kfree(bridge_connector);
+               return ERR_PTR(ret);
+       }
+
        drm_connector_helper_add(connector, &drm_bridge_connector_helper_funcs);
 
        if (bridge_connector->bridge_hpd)
-- 
2.34.1

Reply via email to