leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Javier Martinez Canillas <javier@osg.samsung.com>
Tested-by: Nicolas Dufresne <nicoas.dufresne@collabora.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Javier Martinez Canillas 2016-03-23 21:41:40 -03:00 committed by Mauro Carvalho Chehab
parent 3b2aa383b3
commit 4f355cb567
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/platform/exynos4-is/fimc-is.c
View File

@ -165,6 +165,7 @@ static int fimc_is_parse_sensor_config(struct fimc_is *is, unsigned int index,
struct device_node *node)
{
struct fimc_is_sensor *sensor = &is->sensor[index];
struct device_node *ep, *port;
u32 tmp = 0;
int ret;
@ -175,22 +176,25 @@ static int fimc_is_parse_sensor_config(struct fimc_is *is, unsigned int index,
return -EINVAL;
}
node = of_graph_get_next_endpoint(node, NULL);
if (!node)
ep = of_graph_get_next_endpoint(node, NULL);
if (!ep)
return -ENXIO;
node = of_graph_get_remote_port(node);
if (!node)
port = of_graph_get_remote_port(ep);
of_node_put(ep);
if (!port)
return -ENXIO;
/* 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) {
dev_err(&is->pdev->dev, "reg property not found at: %s\n",
node->full_name);
port->full_name);
of_node_put(port);
return ret;
}
of_node_put(port);
sensor->i2c_bus = tmp - FIMC_INPUT_MIPI_CSI2_0;
return 0;
}