drm/vc4: dpi: Return an error if we can't enable our clock

If we fail to enable the DPI clock, we just ignore the error and moves
forward. Let's return an error instead.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-27-maxime@cerno.tech

diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c
index 7a1112c12be47d1821a8ca9ecee03d986937195d..7028a789919d20307088776423385a59ce2f658d 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_dpi.c
+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
@@ -290,6 +290,7 @@ static int vc4_dpi_bind(struct device *dev, struct device *master, void *data)
                        DRM_ERROR("Failed to get core clock: %d\n", ret);
                return ret;
        }
+
        dpi->pixel_clock = devm_clk_get(dev, "pixel");
        if (IS_ERR(dpi->pixel_clock)) {
                ret = PTR_ERR(dpi->pixel_clock);
@@ -299,8 +300,10 @@ static int vc4_dpi_bind(struct device *dev, struct device *master, void *data)
        }
 
        ret = clk_prepare_enable(dpi->core_clock);
-       if (ret)
+       if (ret) {
                DRM_ERROR("Failed to turn on core clock: %d\n", ret);
+               return ret;
+       }
 
        drm_simple_encoder_init(drm, &dpi->encoder.base, DRM_MODE_ENCODER_DPI);
        drm_encoder_helper_add(&dpi->encoder.base, &vc4_dpi_encoder_helper_funcs);