From patchwork Thu Sep 25 07:40:51 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philipp Zabel
X-Patchwork-Id: 4973541
Return-Path:
X-Original-To: patchwork-linux-media@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.19.201])
by patchwork2.web.kernel.org (Postfix) with ESMTP id CF919BEEA6
for ;
Thu, 25 Sep 2014 07:41:34 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
by mail.kernel.org (Postfix) with ESMTP id A926720295
for ;
Thu, 25 Sep 2014 07:41:33 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
by mail.kernel.org (Postfix) with ESMTP id 52C942025A
for ;
Thu, 25 Sep 2014 07:41:32 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1752181AbaIYHk5 (ORCPT
);
Thu, 25 Sep 2014 03:40:57 -0400
Received: from metis.ext.pengutronix.de ([92.198.50.35]:42542 "EHLO
metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1751568AbaIYHk5 (ORCPT
);
Thu, 25 Sep 2014 03:40:57 -0400
Received: from paszta.hi.pengutronix.de
([2001:67c:670:100:96de:80ff:fec2:9969] helo=paszta)
by metis.ext.pengutronix.de with esmtp (Exim 4.72)
(envelope-from )
id 1XX3fZ-0002KD-Mi; Thu, 25 Sep 2014 09:40:53 +0200
Message-ID: <1411630851.5671.2.camel@pengutronix.de>
Subject: Re: [PATCH v3 1/8] [media] soc_camera: Do not decrement endpoint
node refcount in the loop
From: Philipp Zabel
To: Guennadi Liakhovetski
Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
devel@driverdev.osuosl.org, Grant Likely ,
Greg Kroah-Hartman ,
Laurent Pinchart ,
Mauro Carvalho Chehab ,
Russell King , kernel@pengutronix.de
Date: Thu, 25 Sep 2014 09:40:51 +0200
In-Reply-To:
References: <1410449587-1677-1-git-send-email-p.zabel@pengutronix.de>
<1410449587-1677-2-git-send-email-p.zabel@pengutronix.de>
X-Mailer: Evolution 3.12.6-1
Mime-Version: 1.0
X-SA-Exim-Connect-IP: 2001:67c:670:100:96de:80ff:fec2:9969
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de);
SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-media@vger.kernel.org
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID:
X-Mailing-List: linux-media@vger.kernel.org
X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI,
RP_MATCHES_RCVD,
UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP
Hi Guennadi,
Am Samstag, den 20.09.2014, 09:24 +0200 schrieb Guennadi Liakhovetski:
> Hi Philippe,
>
> On Thu, 11 Sep 2014, Philipp Zabel wrote:
>
> > In preparation for a following patch, stop decrementing the endpoint node
> > refcount in the loop. This temporarily leaks a reference to the endpoint node,
> > which will be fixed by having of_graph_get_next_endpoint decrement the refcount
> > of its prev argument instead.
> >
> > Signed-off-by: Philipp Zabel
> > ---
> > drivers/media/platform/soc_camera/soc_camera.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
> > index f4308fe..f752489 100644
> > --- a/drivers/media/platform/soc_camera/soc_camera.c
> > +++ b/drivers/media/platform/soc_camera/soc_camera.c
> > @@ -1696,11 +1696,11 @@ static void scan_of_host(struct soc_camera_host *ici)
> > if (!i)
> > soc_of_bind(ici, epn, ren->parent);
> >
> > - of_node_put(epn);
> > of_node_put(ren);
> >
> > if (i) {
> > dev_err(dev, "multiple subdevices aren't supported yet!\n");
> > + of_node_put(epn);
>
> Sorry, this doesn't look right to me. I think you want to drop the last
> reference _after_ the loop, not in this temporary check for multiple
> endpoints, which your patch has nothing to do with.
Since we only ever break out of the loop here or if epn == NULL, it
won't make a difference. Would you prefer this:
regards
Philipp
---
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1696,7 +1696,6 @@ static void scan_of_host(struct soc_camera_host *ici)
if (!i)
soc_of_bind(ici, epn, ren->parent);
- of_node_put(epn);
of_node_put(ren);
if (i) {
@@ -1704,6 +1703,8 @@ static void scan_of_host(struct soc_camera_host *ici)
break;
}
}
+
+ of_node_put(epn);
}
#else