mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 195b7433f951847965210bb8a7af7603f6b991c7 Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Fri, 23 Aug 2019 16:34:38 +0100
|
|
Subject: [PATCH 194/634] v3d_drv: Handle missing clock more gracefully
|
|
|
|
Signed-off-by: popcornmix <popcornmix@gmail.com>
|
|
---
|
|
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 e202870873a4..6112a8f72adc 100644
|
|
--- a/drivers/gpu/drm/v3d/v3d_drv.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_drv.c
|
|
@@ -298,10 +298,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
|
|
--
|
|
2.33.1
|
|
|