linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jernej Skrabec <jernej.skrabec@siol.net>
To: maxime.ripard@bootlin.com, wens@csie.org, robh+dt@kernel.org
Cc: airlied@linux.ie, mark.rutland@arm.com,
	dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com
Subject: [PATCH v2 07/18] drm/sun4i: DW HDMI: Release nodes if error happens during CRTC search
Date: Tue, 10 Jul 2018 22:35:00 +0200	[thread overview]
Message-ID: <20180710203511.18454-8-jernej.skrabec@siol.net> (raw)
In-Reply-To: <20180710203511.18454-1-jernej.skrabec@siol.net>

If error happens in sun8i_dw_hdmi_find_possible_crtcs(), nodes are not
released with of_node_put() before returning.

Fix that by calling of_node_put() when necessary. While on it, clean up
the code by using of_graph_get_remote_node() which also lowers number of
cases where error handling has to be performed.

Fixes: 57e23de02f48 ("drm/sun4i: DW HDMI: Expand algorithm for possible crtcs")

Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
 drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
index 3459b9ec56c9..21dc9ebad0b4 100644
--- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
+++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
@@ -53,22 +53,14 @@ static u32 sun8i_dw_hdmi_find_possible_crtcs(struct drm_device *drm,
 	struct device_node *port, *ep, *remote, *remote_port;
 	u32 crtcs = 0;
 
-	port = of_graph_get_port_by_id(node, 0);
-	if (!port)
-		return 0;
-
-	ep = of_get_next_available_child(port, NULL);
-	if (!ep)
-		return 0;
-
-	remote = of_graph_get_remote_port_parent(ep);
+	remote = of_graph_get_remote_node(node, 0, -1);
 	if (!remote)
 		return 0;
 
 	if (sun8i_dw_hdmi_node_is_tcon_top(remote)) {
 		port = of_graph_get_port_by_id(remote, 4);
 		if (!port)
-			return 0;
+			goto crtcs_exit;
 
 		for_each_child_of_node(port, ep) {
 			remote_port = of_graph_get_remote_port(ep);
@@ -81,6 +73,9 @@ static u32 sun8i_dw_hdmi_find_possible_crtcs(struct drm_device *drm,
 		crtcs = drm_of_find_possible_crtcs(drm, node);
 	}
 
+crtcs_exit:
+	of_node_put(remote);
+
 	return crtcs;
 }
 
-- 
2.18.0


  parent reply	other threads:[~2018-07-10 20:35 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-10 20:34 [PATCH v2 00/18] Allwinner R40 HDMI refactoring Jernej Skrabec
2018-07-10 20:34 ` [PATCH v2 01/18] dt-bindings: display: sun4i-drm: Add R40 display engine compatible Jernej Skrabec
2018-07-10 20:34 ` [PATCH v2 02/18] drm/sun4i: " Jernej Skrabec
2018-07-10 20:34 ` [PATCH v2 03/18] ARM: dts: sun8i: r40: Remove fallback " Jernej Skrabec
2018-07-10 20:34 ` [PATCH v2 04/18] drm/sun4i: tcon-top: Cleanup clock handling Jernej Skrabec
2018-07-10 23:20   ` kbuild test robot
2018-07-11  2:54     ` Chen-Yu Tsai
2018-07-10 20:34 ` [PATCH v2 05/18] drm/sun4i: tcon: Release node when traversing of graph Jernej Skrabec
2018-07-10 20:34 ` [PATCH v2 06/18] dt-bindings: display: sun4i-drm: Add R40 TV TCON description Jernej Skrabec
2018-07-10 20:35 ` Jernej Skrabec [this message]
2018-07-10 20:35 ` [PATCH v2 08/18] ARM: dts: sun8i: r40: Add mixer ids to TCON TOP Jernej Skrabec
2018-07-11  2:55   ` Chen-Yu Tsai
2018-07-10 20:35 ` [PATCH v2 09/18] drm/sun4i: mixer: Order includes alphabetically Jernej Skrabec
2018-07-11  2:56   ` Chen-Yu Tsai
2018-07-10 20:35 ` [PATCH v2 10/18] drm/sun4i: mixer: Read id from DT Jernej Skrabec
2018-07-11  3:11   ` Chen-Yu Tsai
2018-07-11  7:10     ` Jernej Škrabec
2018-07-11  7:11       ` Chen-Yu Tsai
2018-07-10 20:35 ` [PATCH v2 11/18] drm/sun4i: tcon-top: Add helpers for mux switching Jernej Skrabec
2018-07-10 20:35 ` [PATCH v2 12/18] drm/sun4i: tcon: Add another way for matching mixers with tcon Jernej Skrabec
2018-07-10 20:35 ` [PATCH v2 13/18] drm/sun4i: tcon: Add support for R40 TCON Jernej Skrabec
2018-07-10 20:35 ` [PATCH v2 14/18] ARM: dts: sun8i: r40: Remove fallback compatible for TCON TV Jernej Skrabec
2018-07-10 20:35 ` [PATCH v2 15/18] ARM: dts: sun8i: r40: Add missing TCON-TOP - TCON connections Jernej Skrabec
2018-07-10 20:35 ` [PATCH v2 16/18] ARM: dts: sun8i: r40: Disable TCONs by default Jernej Skrabec
2018-07-10 20:35 ` [PATCH v2 17/18] drm/sun4i: tcon-top: Remove mux configuration at probe time Jernej Skrabec
2018-07-11  3:15   ` Chen-Yu Tsai
2018-07-10 20:35 ` [PATCH v2 18/18] dt-bindings: display: sun4i-drm: Fix order of DW HDMI PHY compatibles Jernej Skrabec
2018-07-11  8:30 ` [PATCH v2 00/18] Allwinner R40 HDMI refactoring Maxime Ripard
2018-07-11  8:37   ` Chen-Yu Tsai
2018-07-11  8:41   ` Jernej Škrabec
2018-07-11  9:30     ` Maxime Ripard
2018-07-11  9:34       ` [linux-sunxi] " Jernej Škrabec
2018-07-11 13:36         ` Maxime Ripard
2018-07-22 14:43   ` Jernej Škrabec
2018-07-24 12:37     ` Maxime Ripard
2018-07-24 16:04       ` Icenowy Zheng
2018-07-24 17:20         ` [linux-sunxi] " Jernej Škrabec
2018-07-24 17:23           ` Icenowy Zheng
2018-08-14  5:43       ` Icenowy Zheng
2018-08-14  5:47         ` [linux-sunxi] " Chen-Yu Tsai

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=20180710203511.18454-8-jernej.skrabec@siol.net \
    --to=jernej.skrabec@siol.net \
    --cc=airlied@linux.ie \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=mark.rutland@arm.com \
    --cc=maxime.ripard@bootlin.com \
    --cc=robh+dt@kernel.org \
    --cc=wens@csie.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).