All of lore.kernel.org
 help / color / mirror / Atom feed
From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
	Kukjin Kim <kgene@kernel.org>,
	Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
	linux-samsung-soc@vger.kernel.org,
	Kyungmin Park <kyungmin.park@samsung.com>,
	Krzysztof Kozlowski <k.kozlowski@samsung.com>,
	Sylwester Nawrocki <s.nawrocki@samsung.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-media@vger.kernel.org
Subject: [PATCH 1/2] [media] exynos4-is: Put node before s5pcsis_parse_dt() return error
Date: Fri,  4 Mar 2016 17:20:12 -0300	[thread overview]
Message-ID: <1457122813-12791-2-git-send-email-javier@osg.samsung.com> (raw)
In-Reply-To: <1457122813-12791-1-git-send-email-javier@osg.samsung.com>

The MIPI CSIS DT parse function return an -ENXIO errno if the port #
is outside of the supported values. But it doesn't call of_node_put()
to decrement the node's reference counter, that's incremented inside
the of_graph_get_next_endpoint() function that was called before.

Instead of just returning, go to the error path that already does it.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 drivers/media/platform/exynos4-is/mipi-csis.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index bd5c46c3d4b7..bf954424e7be 100644
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -757,8 +757,10 @@ static int s5pcsis_parse_dt(struct platform_device *pdev,
 		goto err;
 
 	state->index = endpoint.base.port - FIMC_INPUT_MIPI_CSI2_0;
-	if (state->index >= CSIS_MAX_ENTITIES)
-		return -ENXIO;
+	if (state->index >= CSIS_MAX_ENTITIES) {
+		ret = -ENXIO;
+		goto err;
+	}
 
 	/* Get MIPI CSI-2 bus configration from the endpoint node. */
 	of_property_read_u32(node, "samsung,csis-hs-settle",
-- 
2.5.0

WARNING: multiple messages have this Message-ID (diff)
From: javier@osg.samsung.com (Javier Martinez Canillas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] [media] exynos4-is: Put node before s5pcsis_parse_dt() return error
Date: Fri,  4 Mar 2016 17:20:12 -0300	[thread overview]
Message-ID: <1457122813-12791-2-git-send-email-javier@osg.samsung.com> (raw)
In-Reply-To: <1457122813-12791-1-git-send-email-javier@osg.samsung.com>

The MIPI CSIS DT parse function return an -ENXIO errno if the port #
is outside of the supported values. But it doesn't call of_node_put()
to decrement the node's reference counter, that's incremented inside
the of_graph_get_next_endpoint() function that was called before.

Instead of just returning, go to the error path that already does it.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 drivers/media/platform/exynos4-is/mipi-csis.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index bd5c46c3d4b7..bf954424e7be 100644
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -757,8 +757,10 @@ static int s5pcsis_parse_dt(struct platform_device *pdev,
 		goto err;
 
 	state->index = endpoint.base.port - FIMC_INPUT_MIPI_CSI2_0;
-	if (state->index >= CSIS_MAX_ENTITIES)
-		return -ENXIO;
+	if (state->index >= CSIS_MAX_ENTITIES) {
+		ret = -ENXIO;
+		goto err;
+	}
 
 	/* Get MIPI CSI-2 bus configration from the endpoint node. */
 	of_property_read_u32(node, "samsung,csis-hs-settle",
-- 
2.5.0

  reply	other threads:[~2016-03-04 20:20 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-04 20:20 [PATCH 0/2] [media] exynos4-is: Trivial fixes for DT port/endpoint parse logic Javier Martinez Canillas
2016-03-04 20:20 ` Javier Martinez Canillas
2016-03-04 20:20 ` Javier Martinez Canillas [this message]
2016-03-04 20:20   ` [PATCH 1/2] [media] exynos4-is: Put node before s5pcsis_parse_dt() return error Javier Martinez Canillas
2016-03-04 20:20 ` [PATCH 2/2] [media] exynos4-is: FIMC port parse should fail if there's no endpoint Javier Martinez Canillas
2016-03-04 20:20   ` Javier Martinez Canillas
2016-03-11 13:03   ` Sylwester Nawrocki
2016-03-11 13:03     ` Sylwester Nawrocki
2016-03-11 14:55     ` Javier Martinez Canillas
2016-03-11 14:55       ` Javier Martinez Canillas
2016-03-11 14:55       ` Javier Martinez Canillas
2016-03-22 20:19     ` Javier Martinez Canillas
2016-03-22 20:19       ` Javier Martinez Canillas
2016-03-05  4:35 ` [PATCH 0/2] [media] exynos4-is: Trivial fixes for DT port/endpoint parse logic Krzysztof Kozlowski
2016-03-05  4:35   ` Krzysztof Kozlowski
2016-03-07  9:24   ` Sylwester Nawrocki
2016-03-07  9:24     ` Sylwester Nawrocki
2016-03-07  9:24     ` Sylwester Nawrocki
2016-03-07 14:30     ` Javier Martinez Canillas
2016-03-07 14:30       ` Javier Martinez Canillas
2016-03-11 13:09       ` Sylwester Nawrocki
2016-03-11 13:09         ` Sylwester Nawrocki
2016-03-11 14:39         ` Javier Martinez Canillas
2016-03-11 14:39           ` Javier Martinez Canillas
2016-03-11 14:39           ` Javier Martinez Canillas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1457122813-12791-2-git-send-email-javier@osg.samsung.com \
    --to=javier@osg.samsung.com \
    --cc=k.kozlowski@samsung.com \
    --cc=kgene@kernel.org \
    --cc=kyungmin.park@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=mchehab@osg.samsung.com \
    --cc=s.nawrocki@samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.