Message ID | 1453768906-28979-2-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Sylwester Nawrocki |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84) (envelope-from <linux-media-owner@vger.kernel.org>) id 1aNriA-0007zY-DE; Tue, 26 Jan 2016 00:42:22 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-8) with esmtp id 1aNri8-0006i3-jG; Tue, 26 Jan 2016 01:42:22 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932913AbcAZAmG (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Mon, 25 Jan 2016 19:42:06 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:28669 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932687AbcAZAmC (ORCPT <rfc822;linux-media@vger.kernel.org>); Mon, 25 Jan 2016 19:42:02 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O1J00GM7B9ZCR00@mailout1.w1.samsung.com>; Tue, 26 Jan 2016 00:41:59 +0000 (GMT) X-AuditID: cbfec7f4-f79026d00000418a-6b-56a6c0d73dd6 Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 3F.58.16778.7D0C6A65; Tue, 26 Jan 2016 00:41:59 +0000 (GMT) Received: from localhost.localdomain ([10.113.63.52]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O1J002XRB9O5800@eusync4.samsung.com>; Tue, 26 Jan 2016 00:41:59 +0000 (GMT) From: Krzysztof Kozlowski <k.kozlowski@samsung.com> To: Kyungmin Park <kyungmin.park@samsung.com>, Sylwester Nawrocki <s.nawrocki@samsung.com>, Mauro Carvalho Chehab <mchehab@osg.samsung.com>, Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <k.kozlowski@samsung.com>, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas <javier@osg.samsung.com> Subject: [RFT 2/2] [media] exynos4-is: Add missing port parent of_node_put on error paths Date: Tue, 26 Jan 2016 09:41:46 +0900 Message-id: <1453768906-28979-2-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1453768906-28979-1-git-send-email-k.kozlowski@samsung.com> References: <1453768906-28979-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrILMWRmVeSWpSXmKPExsVy+t/xa7rXDywLM9izlMfizds1TBavXxha 9D9+zWxxtukNu8Wmx9dYLS7vmsNm0bNhK6vFjPP7mCxWP6uwOPymndWBy2PTqk42j81L6j22 9N9l9+jbsorR4/MmuQDWKC6blNSczLLUIn27BK6M43+nMxW85ahYd+AqSwPjefYuRk4OCQET iTcNVxghbDGJC/fWs3UxcnEICSxllFh07gQjhPOfUeJb4xYmkCo2AWOJzcuXgFWJCDxnklg0 bSrYKGYBU4nHd9ezgNjCAtESnR9XgzWwCKhK/GxaABbnFXCXeDZjB9Q6OYmTxyazgticAh4S O/q+gNUIAdXsbF7CMoGRdwEjwypG0dTS5ILipPRcQ73ixNzi0rx0veT83E2MkID7soNx8TGr Q4wCHIxKPLwbCpaFCbEmlhVX5h5ilOBgVhLh3bsXKMSbklhZlVqUH19UmpNafIhRmoNFSZx3 7q73IUIC6YklqdmpqQWpRTBZJg5OqQbGeScfy60K+Cl0b0ZQ77KJZ3eaBt7/YndV3b03QShw +podGgeNevjdxd9aN7Icq+hs1FF9cJhloqV197E0JUOP1fWbV/DXn9x6b0+t3vnLzQ9V9IXs SqN3yft7PrFvvhC/QV9U+Jb4ta1xN1Ztr38UPLXqokpNcqPn0U8ND07vrFhl3LHqtf4aJZbi jERDLeai4kQAup90ozQCAAA= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.1.26.3318 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_TO_X5 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS ' |
Commit Message
Krzysztof Kozlowski
Jan. 26, 2016, 12:41 a.m. UTC
In fimc_md_parse_port_node() remote port parent node is get with
of_graph_get_remote_port_parent() but it is not put on error path.
Fixes: fa91f1056f17 ("[media] exynos4-is: Add support for asynchronous subdevices registration")
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@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(-)
Comments
Hello Krzysztof, On 01/25/2016 09:41 PM, Krzysztof Kozlowski wrote: > In fimc_md_parse_port_node() remote port parent node is get with > of_graph_get_remote_port_parent() but it is not put on error path. > > Fixes: fa91f1056f17 ("[media] exynos4-is: Add support for asynchronous subdevices registration") > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@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 de0977479327..d2e564878e06 100644 > --- a/drivers/media/platform/exynos4-is/media-dev.c > +++ b/drivers/media/platform/exynos4-is/media-dev.c > @@ -385,8 +385,10 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd, > else > pd->fimc_bus_type = pd->sensor_bus_type; > > - if (WARN_ON(index >= ARRAY_SIZE(fmd->sensor))) > + if (WARN_ON(index >= ARRAY_SIZE(fmd->sensor))) { > + of_node_put(rem); > return -EINVAL; > + } > > fmd->sensor[index].asd.match_type = V4L2_ASYNC_MATCH_OF; > fmd->sensor[index].asd.match.of.node = rem; > Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Best regards,
On 01/26/2016 01:41 AM, Krzysztof Kozlowski wrote: > In fimc_md_parse_port_node() remote port parent node is get with > of_graph_get_remote_port_parent() but it is not put on error path. > > Fixes: fa91f1056f17 ("[media] exynos4-is: Add support for > asynchronous subdevices registration") > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Thanks, patch applied with s/is get/is acquired/. > --- > > 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 de0977479327..d2e564878e06 100644 > --- a/drivers/media/platform/exynos4-is/media-dev.c > +++ b/drivers/media/platform/exynos4-is/media-dev.c > @@ -385,8 +385,10 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd, > else > pd->fimc_bus_type = pd->sensor_bus_type; > > - if (WARN_ON(index >= ARRAY_SIZE(fmd->sensor))) > + if (WARN_ON(index >= ARRAY_SIZE(fmd->sensor))) { > + of_node_put(rem); > return -EINVAL; > + } > > fmd->sensor[index].asd.match_type = V4L2_ASYNC_MATCH_OF; > fmd->sensor[index].asd.match.of.node = rem;
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index de0977479327..d2e564878e06 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -385,8 +385,10 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd, else pd->fimc_bus_type = pd->sensor_bus_type; - if (WARN_ON(index >= ARRAY_SIZE(fmd->sensor))) + if (WARN_ON(index >= ARRAY_SIZE(fmd->sensor))) { + of_node_put(rem); return -EINVAL; + } fmd->sensor[index].asd.match_type = V4L2_ASYNC_MATCH_OF; fmd->sensor[index].asd.match.of.node = rem;