[PATCH] drm/meson: Fix next_bridge reference leak in meson_encoder_cvbs_probe()

[PATCH] drm/meson: Fix next_bridge reference leak in meson_encoder_cvbs_probe()

[Wentao Liang]

The failure paths after drm_bridge_add() return without removing the
bridge, so the bridge stays in the global bridge list, the reference
dropped by drm_bridge_add() is never released and the bridge is never
freed, leaking the next_bridge reference as well. Remove the bridge on
the encoder init, bridge attach and bridge connector error paths.

Fixes: 47fa48b3faa7 ("drm/meson: encoder_cvbs: get/put the next bridge")
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
---
 drivers/gpu/drm/meson/meson_encoder_cvbs.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/meson/meson_encoder_cvbs.c b/drivers/gpu/drm/meson/meson_encoder_cvbs.c
index 41071d6e05e5..a4d280c5f8ed 100644
--- a/drivers/gpu/drm/meson/meson_encoder_cvbs.c
+++ b/drivers/gpu/drm/meson/meson_encoder_cvbs.c
@@ -259,9 +259,11 @@ int meson_encoder_cvbs_probe(struct meson_drm *priv)
 	/* Encoder */
 	ret = drm_simple_encoder_init(priv->drm, &meson_encoder_cvbs->encoder,
 				      DRM_MODE_ENCODER_TVDAC);
-	if (ret)
+	if (ret) {
+		drm_bridge_remove(&meson_encoder_cvbs->bridge);
 		return dev_err_probe(priv->dev, ret,
 				     "Failed to init CVBS encoder\n");
+	}
 
 	meson_encoder_cvbs->encoder.possible_crtcs = BIT(0);
 
@@ -270,14 +272,17 @@ int meson_encoder_cvbs_probe(struct meson_drm *priv)
 				DRM_BRIDGE_ATTACH_NO_CONNECTOR);
 	if (ret) {
 		dev_err(priv->dev, "Failed to attach bridge: %d\n", ret);
+		drm_bridge_remove(&meson_encoder_cvbs->bridge);
 		return ret;
 	}
 
 	/* Initialize & attach Bridge Connector */
 	connector = drm_bridge_connector_init(priv->drm, &meson_encoder_cvbs->encoder);
-	if (IS_ERR(connector))
+	if (IS_ERR(connector)) {
+		drm_bridge_remove(&meson_encoder_cvbs->bridge);
 		return dev_err_probe(priv->dev, PTR_ERR(connector),
 				     "Unable to create CVBS bridge connector\n");
+	}
 
 	drm_connector_attach_encoder(connector, &meson_encoder_cvbs->encoder);
 
-- 
2.34.1