4.14-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Akinobu Mita <akinobu.m...@gmail.com>

[ Upstream commit 06fe932307d58108a11c3e603517dd2a73a57b80 ]

The device node obtained with of_graph_get_next_endpoint() should be
released by calling of_node_put().  But it was not released when
v4l2_fwnode_endpoint_parse() failed.

This change moves the of_node_put() call before the error check and
fixes the issue.

Cc: Mauro Carvalho Chehab <mche...@s-opensource.com>
Signed-off-by: Akinobu Mita <akinobu.m...@gmail.com>
Acked-by: Todor Tomov <todor.to...@linaro.org>
Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/media/i2c/ov5645.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/media/i2c/ov5645.c
+++ b/drivers/media/i2c/ov5645.c
@@ -1131,13 +1131,14 @@ static int ov5645_probe(struct i2c_clien
 
        ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint),
                                         &ov5645->ep);
+
+       of_node_put(endpoint);
+
        if (ret < 0) {
                dev_err(dev, "parsing endpoint node failed\n");
                return ret;
        }
 
-       of_node_put(endpoint);
-
        if (ov5645->ep.bus_type != V4L2_MBUS_CSI2) {
                dev_err(dev, "invalid bus type, must be CSI2\n");
                return -EINVAL;


Reply via email to