The reference on the next bridge returned by
of_drm_find_and_get_bridge() is never released when
drm_simple_encoder_init() or drm_bridge_attach() fails. Drop it on
both error paths before returning.

Fixes: bfb8f5d0a9e7 ("drm/meson: encoder_dsi: get/put the next bridge")
Signed-off-by: Wentao Liang <[email protected]>
---
 drivers/gpu/drm/meson/meson_encoder_dsi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/meson/meson_encoder_dsi.c 
b/drivers/gpu/drm/meson/meson_encoder_dsi.c
index eba246791c68..5f2eeeaf93b8 100644
--- a/drivers/gpu/drm/meson/meson_encoder_dsi.c
+++ b/drivers/gpu/drm/meson/meson_encoder_dsi.c
@@ -135,17 +135,21 @@ int meson_encoder_dsi_probe(struct meson_drm *priv)
        /* Encoder */
        ret = drm_simple_encoder_init(priv->drm, &meson_encoder_dsi->encoder,
                                      DRM_MODE_ENCODER_DSI);
-       if (ret)
+       if (ret) {
+               drm_bridge_put(meson_encoder_dsi->bridge.next_bridge);
                return dev_err_probe(priv->dev, ret,
                                     "Failed to init DSI encoder\n");
+       }
 
        meson_encoder_dsi->encoder.possible_crtcs = BIT(0);
 
        /* Attach DSI Encoder Bridge to Encoder */
        ret = drm_bridge_attach(&meson_encoder_dsi->encoder, 
&meson_encoder_dsi->bridge, NULL, 0);
-       if (ret)
+       if (ret) {
+               drm_bridge_put(meson_encoder_dsi->bridge.next_bridge);
                return dev_err_probe(priv->dev, ret,
                                     "Failed to attach bridge\n");
+       }
 
        /*
         * We should have now in place:
-- 
2.34.1

Reply via email to