Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next

[people/arne_f/kernel.git] / drivers / gpu / drm / rockchip / cdn-dp-core.c

diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index fd79a70b855208a7d9e3970b83bae3d8b62a8053..9edb8dc1ea14404a515a3ecc87a379feb02886b2 100644 (file)
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -94,7 +94,7 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp,
 static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
 {
        int ret;
-       u32 rate;
+       unsigned long rate;
 
        ret = clk_prepare_enable(dp->pclk);
        if (ret < 0) {
@@ -123,7 +123,8 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
 
        rate = clk_get_rate(dp->core_clk);
        if (!rate) {
-               DRM_DEV_ERROR(dp->dev, "get clk rate failed: %d\n", rate);
+               DRM_DEV_ERROR(dp->dev, "get clk rate failed\n");
+               ret = -EINVAL;
                goto err_set_rate;
        }