v3d_drv: Handle missing clock more gracefully
authorpopcornmix <popcornmix@gmail.com>
Fri, 23 Aug 2019 15:34:38 +0000 (16:34 +0100)
committerpopcornmix <popcornmix@gmail.com>
Wed, 1 Jul 2020 15:33:10 +0000 (16:33 +0100)
Signed-off-by: popcornmix <popcornmix@gmail.com>
drivers/gpu/drm/v3d/v3d_drv.c

index 72da17e..8b08ad8 100644 (file)
@@ -286,9 +286,9 @@ 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");
+       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));
                goto dev_free;
        }
        v3d->clk_up_rate = clk_get_rate(v3d->clk);