[RFT 1/2] [media] exynos4-is: Add missing endpoint of_node_put on error paths
Sylwester Nawrocki
s.nawrocki at samsung.com
Fri Mar 11 04:30:53 PST 2016
On 01/26/2016 01:41 AM, Krzysztof Kozlowski wrote:
> In fimc_md_parse_port_node() endpoint node is get with of_get_next_child()
> but it is not put on error path.
"is get" doesn't sound right to me, how about rephrasing this to:
"In fimc_md_parse_port_node() reference count of the endpoint node
"is incremented by of_get_next_child() but it is not decremented
on error path."
> Fixes: 56fa1a6a6a7d ("[media] s5p-fimc: Change the driver directory name to exynos4-is")
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski at samsung.com>
> ---
> Not tested on hardware, only built+static checkers.
> ---
> drivers/media/platform/exynos4-is/media-dev.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/exynos4-is/media-dev.c
> b/drivers/media/platform/exynos4-is/media-dev.c
> index f3b2dd30ec77..de0977479327 100644
> --- a/drivers/media/platform/exynos4-is/media-dev.c
> +++ b/drivers/media/platform/exynos4-is/media-dev.c
> @@ -339,8 +339,10 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd,
> return 0;
>
> v4l2_of_parse_endpoint(ep, &endpoint);
> - if (WARN_ON(endpoint.base.port == 0) || index >= FIMC_MAX_SENSORS)
> + if (WARN_ON(endpoint.base.port == 0) || index >= FIMC_MAX_SENSORS) {
> + of_node_put(ep);
> return -EINVAL;
> + }
Thanks for the patch, it looks correct but it doesn't apply cleanly
due to patches already in media master branch [1]. Could you refresh
this patch and resend?
Also I don't quite like multiple calls to of_node_put(), how about
doing something like this instead:
---------------------------8<----------------------------------
diff --git a/drivers/media/platform/exynos4-is/media-dev.c
b/drivers/media/platform/exynos4-is/media-dev.c
index feb521f..663d32e 100644
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -397,18 +397,19 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd,
return 0;
ret = v4l2_of_parse_endpoint(ep, &endpoint);
- if (ret) {
- of_node_put(ep);
- return ret;
+ if (!ret) {
+ if (WARN_ON(endpoint.base.port == 0) ||
+ index >= FIMC_MAX_SENSORS) {
+ ret = -EINVAL;
+ } else {
+ pd->mux_id = (endpoint.base.port - 1) & 0x1;
+ rem = of_graph_get_remote_port_parent(ep);
+ }
}
-
- if (WARN_ON(endpoint.base.port == 0) || index >= FIMC_MAX_SENSORS)
- return -EINVAL;
-
- pd->mux_id = (endpoint.base.port - 1) & 0x1;
-
- rem = of_graph_get_remote_port_parent(ep);
of_node_put(ep);
+ if (ret < 0)
+ return ret;
+
if (rem == NULL) {
v4l2_info(&fmd->v4l2_dev, "Remote device at %s not found\n",
ep->full_name);
---------------------------8<----------------------------------
--
Thanks,
Sylwester
[1] git://linuxtv.org/media_tree.git
More information about the linux-arm-kernel
mailing list