From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756793AbaIKPev (ORCPT ); Thu, 11 Sep 2014 11:34:51 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:55953 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756621AbaIKPdZ (ORCPT ); Thu, 11 Sep 2014 11:33:25 -0400 From: Philipp Zabel To: linux-kernel@vger.kernel.org Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org, Grant Likely , Greg Kroah-Hartman , Guennadi Liakhovetski , Laurent Pinchart , Mauro Carvalho Chehab , Russell King , kernel@pengutronix.de, Philipp Zabel Subject: [PATCH v3 2/8] imx-drm: Do not decrement endpoint node refcount in the loop Date: Thu, 11 Sep 2014 17:33:01 +0200 Message-Id: <1410449587-1677-3-git-send-email-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1410449587-1677-1-git-send-email-p.zabel@pengutronix.de> References: <1410449587-1677-1-git-send-email-p.zabel@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.120 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-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for the 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/staging/imx-drm/imx-drm-core.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c index 6b22106..12303b3 100644 --- a/drivers/staging/imx-drm/imx-drm-core.c +++ b/drivers/staging/imx-drm/imx-drm-core.c @@ -434,14 +434,6 @@ static uint32_t imx_drm_find_crtc_mask(struct imx_drm_device *imxdrm, return 0; } -static struct device_node *imx_drm_of_get_next_endpoint( - const struct device_node *parent, struct device_node *prev) -{ - struct device_node *node = of_graph_get_next_endpoint(parent, prev); - of_node_put(prev); - return node; -} - int imx_drm_encoder_parse_of(struct drm_device *drm, struct drm_encoder *encoder, struct device_node *np) { @@ -453,7 +445,7 @@ int imx_drm_encoder_parse_of(struct drm_device *drm, for (i = 0; ; i++) { u32 mask; - ep = imx_drm_of_get_next_endpoint(np, ep); + ep = of_graph_get_next_endpoint(np, ep); if (!ep) break; @@ -502,7 +494,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node, return -EINVAL; do { - ep = imx_drm_of_get_next_endpoint(node, ep); + ep = of_graph_get_next_endpoint(node, ep); if (!ep) break; -- 2.1.0