From e745acb722b012a2f8c1c98f9d40ca29e294094f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 23 Aug 2019 16:34:38 +0100 Subject: [PATCH] v3d_drv: Handle missing clock more gracefully raspberrypi inclusion category: feature bugzilla: 50432 -------------------------------- Signed-off-by: popcornmix Signed-off-by: Fang Yafen Signed-off-by: Zheng Zengkai --- drivers/gpu/drm/v3d/v3d_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index 065fb20cc4a8..bfbea29c6c1f 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -290,10 +290,10 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) } v3d->clk = devm_clk_get(dev, NULL); - if (IS_ERR(v3d->clk)) { - if (ret != -EPROBE_DEFER) - dev_err(dev, "Failed to get clock\n"); - goto dev_free; + if (IS_ERR_OR_NULL(v3d->clk)) { + if (PTR_ERR(v3d->clk) != -EPROBE_DEFER) + dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk)); + return PTR_ERR(v3d->clk); } v3d->clk_up_rate = clk_get_rate(v3d->clk); /* For downclocking, drop it to the minimum frequency we can get from -- GitLab