Commit 4f355cb5 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab

[media] exynos4-is: Fix fimc_is_parse_sensor_config() nodes handling

The same struct device_node * is used for looking up the I2C sensor, OF
graph endpoint and port. So the reference count is incremented but not
decremented for the endpoint and port nodes.

Fix this by having separate pointers for each node looked up.
Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Tested-by: default avatarNicolas Dufresne <nicoas.dufresne@collabora.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 3b2aa383
...@@ -165,6 +165,7 @@ static int fimc_is_parse_sensor_config(struct fimc_is *is, unsigned int index, ...@@ -165,6 +165,7 @@ static int fimc_is_parse_sensor_config(struct fimc_is *is, unsigned int index,
struct device_node *node) struct device_node *node)
{ {
struct fimc_is_sensor *sensor = &is->sensor[index]; struct fimc_is_sensor *sensor = &is->sensor[index];
struct device_node *ep, *port;
u32 tmp = 0; u32 tmp = 0;
int ret; int ret;
...@@ -175,22 +176,25 @@ static int fimc_is_parse_sensor_config(struct fimc_is *is, unsigned int index, ...@@ -175,22 +176,25 @@ static int fimc_is_parse_sensor_config(struct fimc_is *is, unsigned int index,
return -EINVAL; return -EINVAL;
} }
node = of_graph_get_next_endpoint(node, NULL); ep = of_graph_get_next_endpoint(node, NULL);
if (!node) if (!ep)
return -ENXIO; return -ENXIO;
node = of_graph_get_remote_port(node); port = of_graph_get_remote_port(ep);
if (!node) of_node_put(ep);
if (!port)
return -ENXIO; return -ENXIO;
/* Use MIPI-CSIS channel id to determine the ISP I2C bus index. */ /* Use MIPI-CSIS channel id to determine the ISP I2C bus index. */
ret = of_property_read_u32(node, "reg", &tmp); ret = of_property_read_u32(port, "reg", &tmp);
if (ret < 0) { if (ret < 0) {
dev_err(&is->pdev->dev, "reg property not found at: %s\n", dev_err(&is->pdev->dev, "reg property not found at: %s\n",
node->full_name); port->full_name);
of_node_put(port);
return ret; return ret;
} }
of_node_put(port);
sensor->i2c_bus = tmp - FIMC_INPUT_MIPI_CSI2_0; sensor->i2c_bus = tmp - FIMC_INPUT_MIPI_CSI2_0;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment