Fix to return error code -EINVAL from the error handling case instead of 0, as done elsewhere in this function.
Fixes: 3c31760e760c ('drm/arm: mali-dp: Set crtc.port to the port instead of the endpoint') Signed-off-by: Wei Yongjun weiyj.lk@gmail.com --- drivers/gpu/drm/arm/malidp_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 4e61ea5..44b24cb 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -362,8 +362,10 @@ static int malidp_bind(struct device *dev)
/* Set the CRTC's port so that the encoder component can find it */ ep = of_graph_get_next_endpoint(dev->of_node, NULL); - if (!ep) + if (!ep) { + ret = -EINVAL; goto port_fail; + } malidp->crtc.port = of_get_next_parent(ep);
ret = component_bind_all(dev, drm);
Hi Wei,
On Thu, Jul 28, 2016 at 02:14:26AM +0000, Wei Yongjun wrote:
Fix to return error code -EINVAL from the error handling case instead of 0, as done elsewhere in this function.
Fixes: 3c31760e760c ('drm/arm: mali-dp: Set crtc.port to the port instead of the endpoint') Signed-off-by: Wei Yongjun weiyj.lk@gmail.com
Thanks for cleaning up after me! :-)
Acked-by: Brian Starkey brian.starkey@arm.com
@Sean, can you pick this up on top of 3c31760e760c?
Cheers, Brian
drivers/gpu/drm/arm/malidp_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 4e61ea5..44b24cb 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -362,8 +362,10 @@ static int malidp_bind(struct device *dev)
/* Set the CRTC's port so that the encoder component can find it */ ep = of_graph_get_next_endpoint(dev->of_node, NULL);
- if (!ep)
if (!ep) {
ret = -EINVAL;goto port_fail;
} malidp->crtc.port = of_get_next_parent(ep);
ret = component_bind_all(dev, drm);
On Thu, Jul 28, 2016 at 09:22:21AM +0100, Brian Starkey wrote:
Hi Wei,
On Thu, Jul 28, 2016 at 02:14:26AM +0000, Wei Yongjun wrote:
Fix to return error code -EINVAL from the error handling case instead of 0, as done elsewhere in this function.
Fixes: 3c31760e760c ('drm/arm: mali-dp: Set crtc.port to the port instead of the endpoint') Signed-off-by: Wei Yongjun weiyj.lk@gmail.com
Thanks for cleaning up after me! :-)
Acked-by: Brian Starkey brian.starkey@arm.com
Applied to drm-misc, thanks. -Daniel
@Sean, can you pick this up on top of 3c31760e760c?
Cheers, Brian
drivers/gpu/drm/arm/malidp_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 4e61ea5..44b24cb 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -362,8 +362,10 @@ static int malidp_bind(struct device *dev)
/* Set the CRTC's port so that the encoder component can find it */ ep = of_graph_get_next_endpoint(dev->of_node, NULL);
- if (!ep)
if (!ep) {
ret = -EINVAL;goto port_fail;
} malidp->crtc.port = of_get_next_parent(ep);
ret = component_bind_all(dev, drm);
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
dri-devel@lists.freedesktop.org
-
Brian Starkey -
Daniel Vetter -
Wei Yongjun