summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Anderson <dianders@chromium.org>2019-07-22 11:24:36 -0700
committerBen Hutchings <ben@decadent.org.uk>2019-12-10 18:01:11 +0000
commitae9efb9abd7575453a1e2d1a96cb6d32f34ddde9 (patch)
tree0313859126e35a34928c2627e9ebf9f149e0fc05
parent4186d92d7e25b17b66de41c0548f76badc50eb5b (diff)
downloadlinux-stable-ae9efb9abd7575453a1e2d1a96cb6d32f34ddde9.tar.gz
linux-stable-ae9efb9abd7575453a1e2d1a96cb6d32f34ddde9.tar.bz2
linux-stable-ae9efb9abd7575453a1e2d1a96cb6d32f34ddde9.zip
video: of: display_timing: Add of_node_put() in of_get_display_timing()
commit 4faba50edbcc1df467f8f308893edc3fdd95536e upstream. From code inspection it can be seen that of_get_display_timing() is lacking an of_node_put(). Add it. Fixes: ffa3fd21de8a ("videomode: implement public of_get_display_timing()") Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: David Airlie <airlied@linux.ie> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190722182439.44844-2-dianders@chromium.org Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/video/of_display_timing.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index 987edf110038..5e2aeda42463 100644
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@ -114,6 +114,7 @@ int of_get_display_timing(struct device_node *np, const char *name,
struct display_timing *dt)
{
struct device_node *timing_np;
+ int ret;
if (!np)
return -EINVAL;
@@ -125,7 +126,11 @@ int of_get_display_timing(struct device_node *np, const char *name,
return -ENOENT;
}
- return of_parse_display_timing(timing_np, dt);
+ ret = of_parse_display_timing(timing_np, dt);
+
+ of_node_put(timing_np);
+
+ return ret;
}
EXPORT_SYMBOL_GPL(of_get_display_timing);