812d6f131102f17c741ef6b338866227731d8038
[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0349-v3d_drv-Handle-missing-clock-more-gracefully.patch
1 From 43406ddc1adaebe9b03d010fd024a96cee139cc2 Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Fri, 23 Aug 2019 16:34:38 +0100
4 Subject: [PATCH] v3d_drv: Handle missing clock more gracefully
5
6 Signed-off-by: popcornmix <popcornmix@gmail.com>
7 ---
8 drivers/gpu/drm/v3d/v3d_drv.c | 6 +++---
9 1 file changed, 3 insertions(+), 3 deletions(-)
10
11 --- a/drivers/gpu/drm/v3d/v3d_drv.c
12 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
13 @@ -286,9 +286,9 @@ static int v3d_platform_drm_probe(struct
14 }
15
16 v3d->clk = devm_clk_get(dev, NULL);
17 - if (IS_ERR(v3d->clk)) {
18 - if (ret != -EPROBE_DEFER)
19 - dev_err(dev, "Failed to get clock\n");
20 + if (IS_ERR_OR_NULL(v3d->clk)) {
21 + if (PTR_ERR(v3d->clk) != -EPROBE_DEFER)
22 + dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk));
23 goto dev_free;
24 }
25 v3d->clk_up_rate = clk_get_rate(v3d->clk);