drm/imx/tve: fix probe device leak

[ Upstream commit e535c23513c63f02f67e3e09e0787907029efeaf ]

Make sure to drop the reference taken to the DDC device during probe on
probe failure (e.g. probe deferral) and on driver unbind.

Fixes: fcbc51e54d2a ("staging: drm/imx: Add support for Television Encoder (TVEv2)")
Cc: stable@vger.kernel.org	# 3.10
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20251030163456.15807-1-johan@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index ab4d1c878fda3fde3fe9c6fff7ea950deb876227..f5659756768419b24c1a93ff0adf92c627b13178 100644 (file)
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -522,6 +522,13 @@ static const struct component_ops imx_tve_ops = {
        .bind   = imx_tve_bind,
 };
 
+static void imx_tve_put_device(void *_dev)
+{
+       struct device *dev = _dev;
+
+       put_device(dev);
+}
+
 static int imx_tve_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -543,6 +550,12 @@ static int imx_tve_probe(struct platform_device *pdev)
        if (ddc_node) {
                tve->ddc = of_find_i2c_adapter_by_node(ddc_node);
                of_node_put(ddc_node);
+               if (tve->ddc) {
+                       ret = devm_add_action_or_reset(dev, imx_tve_put_device,
+                                                      &tve->ddc->dev);
+                       if (ret)
+                               return ret;
+               }
        }
 
        tve->mode = of_get_tve_mode(np);