mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 18:09:56 +00:00
drm/sun4i: Fix releasing node when enumerating enpoints
[ Upstream commit 367c359aa8 ]
sun4i_drv_add_endpoints() has a memory leak since it uses of_node_put()
when remote is equal to NULL and does nothing when remote has a valid
pointer.
Invert the logic to fix memory leak.
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180625120304.7543-7-jernej.skrabec@siol.net
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
900812a0d3
commit
9f81b08ad8
@@ -283,7 +283,6 @@ static int sun4i_drv_add_endpoints(struct device *dev,
|
|||||||
remote = of_graph_get_remote_port_parent(ep);
|
remote = of_graph_get_remote_port_parent(ep);
|
||||||
if (!remote) {
|
if (!remote) {
|
||||||
DRM_DEBUG_DRIVER("Error retrieving the output node\n");
|
DRM_DEBUG_DRIVER("Error retrieving the output node\n");
|
||||||
of_node_put(remote);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -297,11 +296,13 @@ static int sun4i_drv_add_endpoints(struct device *dev,
|
|||||||
|
|
||||||
if (of_graph_parse_endpoint(ep, &endpoint)) {
|
if (of_graph_parse_endpoint(ep, &endpoint)) {
|
||||||
DRM_DEBUG_DRIVER("Couldn't parse endpoint\n");
|
DRM_DEBUG_DRIVER("Couldn't parse endpoint\n");
|
||||||
|
of_node_put(remote);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!endpoint.id) {
|
if (!endpoint.id) {
|
||||||
DRM_DEBUG_DRIVER("Endpoint is our panel... skipping\n");
|
DRM_DEBUG_DRIVER("Endpoint is our panel... skipping\n");
|
||||||
|
of_node_put(remote);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user