| From 1e13b65c0d0a4eafcaa9db060ef5d6029f12660b Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 1 Apr 2014 13:03:52 +0200 |
| Subject: drm/rcar-du: Handle encoder initialization failures |
| |
| The rcar_du_encoder_init() function can fail and return an error code. |
| Don't ignore it. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| (cherry picked from commit d9961b22716ddf59ca307fe862f93ff0ea919952) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpu/drm/rcar-du/rcar_du_kms.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| index fbeabd9a281f..a87edfac111f 100644 |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| @@ -248,7 +248,10 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) |
| continue; |
| } |
| |
| - rcar_du_encoder_init(rcdu, pdata->type, pdata->output, pdata); |
| + ret = rcar_du_encoder_init(rcdu, pdata->type, pdata->output, |
| + pdata); |
| + if (ret < 0) |
| + return ret; |
| } |
| |
| /* Set the possible CRTCs and possible clones. There's always at least |
| -- |
| 2.1.2 |
| |
