Merge tag 'pm+acpi-3.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[mirror_ubuntu-hirsute-kernel.git] / drivers / gpu / drm / rcar-du / rcar_du_kms.c

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index fbeabd9a281f9a71c2e283df478fb7e3428a7655..a87edfac111f853056e718f646a6624559fe929a 100644 (file)
--- 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