This patch addresses two problems with endpoint refcounting in parsing
davinci-vpif endpoints:

- put endpoints on error and

- do not dereference endpoints after they have been put.

Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
---
 drivers/media/platform/davinci/vpif_capture.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/davinci/vpif_capture.c 
b/drivers/media/platform/davinci/vpif_capture.c
index b5aacb0fb96b..72bdb3c10962 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1555,7 +1555,6 @@ vpif_capture_get_pdata(struct platform_device *pdev)
                if (!rem) {
                        dev_dbg(&pdev->dev, "Remote device at %pOF not found\n",
                                endpoint);
-                       of_node_put(endpoint);
                        goto done;
                }
 
@@ -1567,7 +1566,6 @@ vpif_capture_get_pdata(struct platform_device *pdev)
                                            GFP_KERNEL);
                if (!chan->inputs) {
                        of_node_put(rem);
-                       of_node_put(endpoint);
                        goto err_cleanup;
                }
 
@@ -1578,7 +1576,6 @@ vpif_capture_get_pdata(struct platform_device *pdev)
 
                err = v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint),
                                                 &bus_cfg);
-               of_node_put(endpoint);
                if (err) {
                        dev_err(&pdev->dev, "Could not parse the endpoint\n");
                        of_node_put(rem);
@@ -1609,6 +1606,7 @@ vpif_capture_get_pdata(struct platform_device *pdev)
        }
 
 done:
+       of_node_put(endpoint);
        pdata->asd_sizes[0] = i;
        pdata->subdev_count = i;
        pdata->card_name = "DA850/OMAP-L138 Video Capture";
@@ -1616,6 +1614,7 @@ vpif_capture_get_pdata(struct platform_device *pdev)
        return pdata;
 
 err_cleanup:
+       of_node_put(endpoint);
        v4l2_async_notifier_cleanup(&vpif_obj.notifier);
 
        return NULL;
-- 
2.11.0

Reply via email to