Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a76404b authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: davinci-vpif: Don't dereference endpoint after putting it, fix refcounting 



The davinci-vpif driver dereferences its local endpoints after releasing
the reference to them.

The driver also puts its endpoints explicitly while the
of_graph_get_next_endpoint() does that, too, leading to obtaining a
reference once and releasing it twice.

Both are fixed by this patch.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 6ddb094a

drivers/media/platform/davinci/vpif_capture.c

+2 −3
Original line number Diff line number Diff line
@@ -1545,7 +1545,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;

		}
@@ -1557,7 +1556,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;

		}
@@ -1568,7 +1566,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);
@@ -1599,6 +1596,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";
@@ -1606,6 +1604,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;