You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
845 B
Diff
26 lines
845 B
Diff
From 9048bbff0eca6d74d41fa58875f31560381b3ca3 Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Fri, 23 Aug 2019 16:34:38 +0100
|
|
Subject: [PATCH] v3d_drv: Handle missing clock more gracefully
|
|
|
|
Signed-off-by: popcornmix <popcornmix@gmail.com>
|
|
---
|
|
drivers/gpu/drm/v3d/v3d_drv.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_drv.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_drv.c
|
|
@@ -301,9 +301,9 @@ static int v3d_platform_drm_probe(struct
|
|
}
|
|
|
|
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);
|