2016-10-08 00:43:48 +00:00
|
|
|
From c92dd30d2a3a73ebbc01e351d8c3b23b18b52350 Mon Sep 17 00:00:00 2001
|
2016-10-07 01:00:45 +00:00
|
|
|
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
|
|
|
Date: Tue, 4 Oct 2016 22:15:41 -0600
|
2016-10-08 00:43:48 +00:00
|
|
|
Subject: [PATCH 14/14] Revert "gpu: drm: omapdrm: dss-of: add missing
|
2016-10-07 01:00:45 +00:00
|
|
|
of_node_put after calling of_parse_phandle"
|
|
|
|
|
|
|
|
This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.
|
|
|
|
---
|
|
|
|
drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +++----
|
|
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
|
|
|
|
index e256d87..dfd4e96 100644
|
|
|
|
--- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
|
|
|
|
+++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
|
|
|
|
@@ -125,16 +125,15 @@ u32 dss_of_port_get_port_number(struct device_node *port)
|
|
|
|
|
|
|
|
static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
|
|
|
|
{
|
|
|
|
- struct device_node *np, *np_parent;
|
|
|
|
+ struct device_node *np;
|
|
|
|
|
|
|
|
np = of_parse_phandle(node, "remote-endpoint", 0);
|
|
|
|
if (!np)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
- np_parent = of_get_next_parent(np);
|
|
|
|
- of_node_put(np);
|
|
|
|
+ np = of_get_next_parent(np);
|
|
|
|
|
|
|
|
- return np_parent;
|
|
|
|
+ return np;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct device_node *
|
|
|
|
--
|
|
|
|
2.10.0
|
|
|
|
|