summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2019-08-22 12:53:23 +1000
committerDave Airlie <airlied@redhat.com>2019-08-22 12:53:29 +1000
commit14673e153926d3ad89e303345d1412cd7bd7c9dd (patch)
tree8592dcacea09d07d656968c82b35e5fcc394f333
parentd1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 (diff)
parenta53358a31c989c360ea59536d28762b9d2d68d19 (diff)
Merge tag 'du-fixes-20190816' of git://linuxtv.org/pinchartl/media into drm-fixes
R-Car LVDS encoder fix Signed-off-by: Dave Airlie <airlied@redhat.com> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190816130115.GH5020@pendragon.ideasonboard.com
-rw-r--r--drivers/gpu/drm/rcar-du/rcar_lvds.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
index 1c62578590f4..082d02c84024 100644
--- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -673,10 +673,8 @@ static int rcar_lvds_parse_dt_companion(struct rcar_lvds *lvds)
/* Locate the companion LVDS encoder for dual-link operation, if any. */
companion = of_parse_phandle(dev->of_node, "renesas,companion", 0);
- if (!companion) {
- dev_err(dev, "Companion LVDS encoder not found\n");
- return -ENXIO;
- }
+ if (!companion)
+ return 0;
/*
* Sanity check: the companion encoder must have the same compatible