* [PATCH] drm: atmel-hlcdc: Fix OF graph parsing
@ 2016-06-03 7:26 Boris Brezillon
2016-06-21 12:00 ` Nicolas Ferre
0 siblings, 1 reply; 2+ messages in thread
From: Boris Brezillon @ 2016-06-03 7:26 UTC (permalink / raw)
To: linux-arm-kernel
atmel_hlcdc_create_outputs() iterates over OF graph nodes and releases
the node (using of_node_put()) after each iteration, which is wrong
since for_each_endpoint_of_node() is already taking care of that.
Move the of_node_put() call in the error path.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons•com>
Fixes: 17a8e03e7e97 ("drm: atmel-hlcdc: rework the output code to support drm bridges")
---
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
index 39802c0..3d34fc4 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
@@ -266,9 +266,10 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev)
if (!ret)
ret = atmel_hlcdc_check_endpoint(dev, &ep);
- of_node_put(ep_np);
- if (ret)
+ if (ret) {
+ of_node_put(ep_np);
return ret;
+ }
}
for_each_endpoint_of_node(dev->dev->of_node, ep_np) {
@@ -276,9 +277,10 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev)
if (!ret)
ret = atmel_hlcdc_attach_endpoint(dev, &ep);
- of_node_put(ep_np);
- if (ret)
+ if (ret) {
+ of_node_put(ep_np);
return ret;
+ }
}
return 0;
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] drm: atmel-hlcdc: Fix OF graph parsing
2016-06-03 7:26 [PATCH] drm: atmel-hlcdc: Fix OF graph parsing Boris Brezillon
@ 2016-06-21 12:00 ` Nicolas Ferre
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Ferre @ 2016-06-21 12:00 UTC (permalink / raw)
To: linux-arm-kernel
Le 03/06/2016 09:26, Boris Brezillon a ?crit :
> atmel_hlcdc_create_outputs() iterates over OF graph nodes and releases
> the node (using of_node_put()) after each iteration, which is wrong
> since for_each_endpoint_of_node() is already taking care of that.
>
> Move the of_node_put() call in the error path.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons•com>
> Fixes: 17a8e03e7e97 ("drm: atmel-hlcdc: rework the output code to support drm bridges")
Reviewed-by: Nicolas Ferre <nicolas.ferre@atmel•com>
> ---
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
> index 39802c0..3d34fc4 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
> @@ -266,9 +266,10 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev)
> if (!ret)
> ret = atmel_hlcdc_check_endpoint(dev, &ep);
>
> - of_node_put(ep_np);
> - if (ret)
> + if (ret) {
> + of_node_put(ep_np);
> return ret;
> + }
> }
>
> for_each_endpoint_of_node(dev->dev->of_node, ep_np) {
> @@ -276,9 +277,10 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev)
> if (!ret)
> ret = atmel_hlcdc_attach_endpoint(dev, &ep);
>
> - of_node_put(ep_np);
> - if (ret)
> + if (ret) {
> + of_node_put(ep_np);
> return ret;
> + }
> }
>
> return 0;
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-21 12:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-03 7:26 [PATCH] drm: atmel-hlcdc: Fix OF graph parsing Boris Brezillon
2016-06-21 12:00 ` Nicolas Ferre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox