summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/rockchip/rockchip_lvds.c
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@intel.com>2024-02-20 20:26:12 +0300
committerLucas De Marchi <lucas.demarchi@intel.com>2024-02-20 20:57:17 +0300
commitfbb944086f2fa36c633be71cfcb38ce9f37eb90e (patch)
tree78428083a0de1e910a2eb025102b462bebdb8bfc /drivers/gpu/drm/rockchip/rockchip_lvds.c
parent0f688c0eb63a643ef0568b29b12cefbb23181e1a (diff)
parent9ac4beb7578a88baa4f7e6a59eeb5be79d7b011a (diff)
downloadlinux-fbb944086f2fa36c633be71cfcb38ce9f37eb90e.tar.xz
Merge drm/drm-next into drm-xe-next
Bring changes from drm-misc-next that got merged in drm-next back to drm-xe so they can be used for additional features. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/rockchip/rockchip_lvds.c')
-rw-r--r--drivers/gpu/drm/rockchip/rockchip_lvds.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
index 59341654ec32..77b76cff1adb 100644
--- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
@@ -576,8 +576,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
ret = -EINVAL;
goto err_put_port;
} else if (ret) {
- DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n");
- ret = -EPROBE_DEFER;
+ dev_err_probe(dev, ret, "failed to find panel and bridge node\n");
goto err_put_port;
}
if (lvds->panel)