From: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Thierry Reding
<thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Sam Ravnborg <sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>,
Laurent Pinchart
<laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Frank Rowand
<frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v8 3/7] drm/tegra: output: Don't leak OF node on error
Date: Thu, 18 Jun 2020 01:26:59 +0300 [thread overview]
Message-ID: <20200617222703.17080-4-digetx@gmail.com> (raw)
In-Reply-To: <20200617222703.17080-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
The OF node should be put before returning error in tegra_output_probe(),
otherwise node's refcount will be leaked.
Reviewed-by: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
Reviewed-by: Sam Ravnborg <sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>
Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/gpu/drm/tegra/output.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index e36e5e7c2f69..a6a711d54e88 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -102,10 +102,10 @@ int tegra_output_probe(struct tegra_output *output)
panel = of_parse_phandle(output->of_node, "nvidia,panel", 0);
if (panel) {
output->panel = of_drm_find_panel(panel);
+ of_node_put(panel);
+
if (IS_ERR(output->panel))
return PTR_ERR(output->panel);
-
- of_node_put(panel);
}
output->edid = of_get_property(output->of_node, "nvidia,edid", &size);
@@ -113,13 +113,12 @@ int tegra_output_probe(struct tegra_output *output)
ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0);
if (ddc) {
output->ddc = of_find_i2c_adapter_by_node(ddc);
+ of_node_put(ddc);
+
if (!output->ddc) {
err = -EPROBE_DEFER;
- of_node_put(ddc);
return err;
}
-
- of_node_put(ddc);
}
output->hpd_gpio = devm_gpiod_get_from_of_node(output->dev,
--
2.26.0
next prev parent reply other threads:[~2020-06-17 22:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 22:26 [PATCH v8 0/7] Support DRM bridges on NVIDIA Tegra Dmitry Osipenko
[not found] ` <20200617222703.17080-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-06-17 22:26 ` [PATCH v8 1/7] of_graph: add of_graph_presents() Dmitry Osipenko
[not found] ` <20200617222703.17080-2-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-06-29 23:12 ` Rob Herring
2020-06-30 17:02 ` Dmitry Osipenko
2020-06-17 22:26 ` [PATCH v8 2/7] drm/of: Make drm_of_find_panel_or_bridge() to check graph's presence Dmitry Osipenko
2020-06-17 22:26 ` Dmitry Osipenko [this message]
2020-06-17 22:27 ` [PATCH v8 5/7] drm/tegra: output: rgb: Support LVDS encoder bridge Dmitry Osipenko
2020-06-17 22:27 ` [PATCH v8 7/7] drm/panel-simple: Add missing connector type for some panels Dmitry Osipenko
[not found] ` <20200617222703.17080-8-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-06-20 11:21 ` Sam Ravnborg
[not found] ` <20200620112132.GB16901-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>
2020-06-20 11:49 ` Laurent Pinchart
[not found] ` <20200620114934.GB5829-N3hz7ZxfLydczECFQUw77jytWr6r+dGw0E9HWUfgJXw@public.gmane.org>
2020-06-20 13:19 ` Dmitry Osipenko
[not found] ` <ea421084-a91c-bc03-5997-1723075b7cae-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-06-20 14:31 ` Sam Ravnborg
[not found] ` <20200620143114.GA22329-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>
2020-06-20 15:05 ` Dmitry Osipenko
[not found] ` <e77a34c1-3e0b-7f30-25d0-a955ec8d8c86-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-06-20 15:30 ` Sam Ravnborg
[not found] ` <20200620153012.GA22743-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>
2020-06-20 16:18 ` Dmitry Osipenko
2020-06-17 22:27 ` [PATCH v8 4/7] drm/tegra: output: Support DRM bridges Dmitry Osipenko
2020-06-17 22:27 ` [PATCH v8 6/7] drm/tegra: output: rgb: Wrap directly-connected panel into DRM bridge Dmitry Osipenko
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=20200617222703.17080-4-digetx@gmail.com \
--to=digetx-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org \
--cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.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